Mirrors/overte-lubosz
3
0
Fork 0
mirror of https://github.com/lubosz/overte.git synced 2025-04-09 07:22:31 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

Clean up the cmakelist to normally onlly do th eminimal linking and include for gl

Browse source
This commit is contained in:
Sam Gateau 2015-07-29 13:55:26 -07:00
parent 17650dde74
commit 661f29924f
2 changed files with 5 additions and 26 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

29
interface/CMakeLists.txt
View file

@ -218,40 +218,19 @@ else (APPLE)
"${PROJECT_SOURCE_DIR}/resources"
$<TARGET_FILE_DIR:${TARGET_NAME}>/resources
)
# find_package(OpenGL REQUIRED)
# if (${OPENGL_INCLUDE_DIR})
# include_directories(SYSTEM "${OPENGL_INCLUDE_DIR}")
# endif ()
# target_link_libraries(${TARGET_NAME} "${OPENGL_LIBRARY}")
# link target to external libraries
if (WIN32)
# add_dependency_external_projects(glew)
# find_package(GLEW REQUIRED)
# target_include_directories(${TARGET_NAME} PRIVATE ${GLEW_INCLUDE_DIRS})
# target_link_libraries(${TARGET_NAME} ${GLEW_LIBRARIES} wsock32.lib opengl32.lib Winmm.lib)
target_link_libraries(${TARGET_NAME} wsock32.lib Winmm.lib)
if (USE_NSIGHT)
# try to find the Nsight package and add it to the build if we find it
find_package(NSIGHT)
# If required NSIGHT lib comes from gpu lib but still to add a precroc define
if (NSIGHT_FOUND)
include_directories(${NSIGHT_INCLUDE_DIRS})
add_definitions(-DNSIGHT_FOUND)
target_link_libraries(${TARGET_NAME} "${NSIGHT_LIBRARIES}")
endif ()
endif()
else (WIN32)
find_package(GLEW REQUIRED)
target_include_directories(${TARGET_NAME} PRIVATE ${GLEW_INCLUDE_DIRS})
target_link_libraries(${TARGET_NAME} ${GLEW_LIBRARIES})
message(STATUS ${GLEW_LIBRARY})
# Nothing else required on linux apparently
endif()
endif (APPLE)

2
libraries/gpu/CMakeLists.txt
View file

@ -23,7 +23,7 @@ elseif (WIN32)
# try to find the Nsight package and add it to the build if we find it
find_package(NSIGHT)
if (NSIGHT_FOUND)
include_directories(${NSIGHT_INCLUDE_DIRS})
target_include_directories(${TARGET_NAME} PUBLIC ${NSIGHT_INCLUDE_DIRS})
add_definitions(-DNSIGHT_FOUND)
target_link_libraries(${TARGET_NAME} "${NSIGHT_LIBRARIES}")
endif ()