FGFS-4.1/simgear
4
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fix #1139

Browse Source 
Always set TEST_LIBS as applications/tools also need to link
them, even if tests are disabled. Also allow disabling building
of sg_pkgutil.
This commit is contained in:
Thomas Geymayer 2013-06-12 23:56:04 +02:00
parent b4526f926d
commit 86e2de8d10
2 changed files with 27 additions and 27 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

43
CMakeLists.txt
View File

@ -113,6 +113,7 @@ option(ENABLE_LIBSVN "Set to ON to build SimGear with libsvnclient support" O
option(ENABLE_RTI "Set to ON to build SimGear with RTI support" OFF)
option(ENABLE_TESTS "Set to OFF to disable building SimGear's test applications" ON)
option(ENABLE_SOUND "Set to OFF to disable building SimGear's sound support" ON)
option(ENABLE_PKGUTIL "Set to ON to build the sg_pkgutil application (default)" ON)
if (MSVC)
GET_FILENAME_COMPONENT(PARENT_DIR ${PROJECT_BINARY_DIR} PATH)
@ -372,30 +373,32 @@ if(ENABLE_TESTS)
include (Dart)
enable_testing()
if(SIMGEAR_SHARED)
set( TEST_LIBS
SimGearCore)
else()
set( TEST_LIBS
SimGearCore
${CMAKE_THREAD_LIBS_INIT}
${ZLIB_LIBRARY}
${WINSOCK_LIBRARY}
${RT_LIBRARY}
${CORE_SERVICES_LIBRARY})
endif()
if(NOT SIMGEAR_HEADLESS)
set( TEST_LIBS
SimGearScene
${TEST_LIBS}
${OPENGL_LIBRARIES})
endif()
else()
message(STATUS "Tests: DISABLED")
endif(ENABLE_TESTS)
# always set TEST_LIBS as it is also used by other tools/applications
# TODO maybe better rename?
if(SIMGEAR_SHARED)
set( TEST_LIBS
SimGearCore)
else()
set( TEST_LIBS
SimGearCore
${CMAKE_THREAD_LIBS_INIT}
${ZLIB_LIBRARY}
${WINSOCK_LIBRARY}
${RT_LIBRARY}
${CORE_SERVICES_LIBRARY})
endif()
if(NOT SIMGEAR_HEADLESS)
set( TEST_LIBS
SimGearScene
${TEST_LIBS}
${OPENGL_LIBRARIES})
endif()
install (FILES ${PROJECT_BINARY_DIR}/simgear/simgear_config.h DESTINATION include/simgear/)
add_subdirectory(simgear)

11
simgear/package/CMakeLists.txt
View File

@ -22,10 +22,7 @@ set(SOURCES
simgear_component(package package "${SOURCES}" "${HEADERS}")
add_executable(sg_pkgutil pkgutil.cxx)
target_link_libraries(sg_pkgutil ${TEST_LIBS})
if(ENABLE_TESTS)
endif(ENABLE_TESTS)
if(ENABLE_PKGUTIL)
add_executable(sg_pkgutil pkgutil.cxx)
target_link_libraries(sg_pkgutil ${TEST_LIBS})
endif()