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

9
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_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_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_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) if (MSVC)
GET_FILENAME_COMPONENT(PARENT_DIR ${PROJECT_BINARY_DIR} PATH) GET_FILENAME_COMPONENT(PARENT_DIR ${PROJECT_BINARY_DIR} PATH)
@ -372,7 +373,12 @@ if(ENABLE_TESTS)
include (Dart) include (Dart)
enable_testing() enable_testing()
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) if(SIMGEAR_SHARED)
set( TEST_LIBS set( TEST_LIBS
SimGearCore) SimGearCore)
@ -392,9 +398,6 @@ if(ENABLE_TESTS)
${TEST_LIBS} ${TEST_LIBS}
${OPENGL_LIBRARIES}) ${OPENGL_LIBRARIES})
endif() endif()
else()
message(STATUS "Tests: DISABLED")
endif(ENABLE_TESTS)
install (FILES ${PROJECT_BINARY_DIR}/simgear/simgear_config.h DESTINATION include/simgear/) install (FILES ${PROJECT_BINARY_DIR}/simgear/simgear_config.h DESTINATION include/simgear/)
add_subdirectory(simgear) add_subdirectory(simgear)

7
simgear/package/CMakeLists.txt
View File

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