fly/flightgear
1
0
Fork 0
Code Activity

TestSuite: Elimination of the now unused ENABLE_TESTS CMake variable.

Browse source
This commit is contained in:
Edward d'Auvergne 2018-06-11 11:39:57 +02:00
parent feb854946e
commit ba5b472705
3 changed files with 4 additions and 14 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

12
CMakeLists.txt
View file

@ -215,7 +215,6 @@ option(ENABLE_FGJS "Set to ON to build the fgjs application (default)" ON)
option(ENABLE_JS_DEMO "Set to ON to build the js_demo application (default)" ON) option(ENABLE_JS_DEMO "Set to ON to build the js_demo application (default)" ON)
option(ENABLE_METAR "Set to ON to build the metar application (default)" ON) option(ENABLE_METAR "Set to ON to build the metar application (default)" ON)
option(ENABLE_STGMERGE "Set to ON to build the stgmerge application (default)" OFF) option(ENABLE_STGMERGE "Set to ON to build the stgmerge application (default)" OFF)
option(ENABLE_TESTS "Set to ON to build test applications (default)" ON)
option(ENABLE_FGCOM "Set to ON to build the FGCom application (default)" ON) option(ENABLE_FGCOM "Set to ON to build the FGCom application (default)" ON)
option(ENABLE_FLITE "Set to ON to build the Flite text-to-speech module" ON) option(ENABLE_FLITE "Set to ON to build the Flite text-to-speech module" ON)
option(ENABLE_QT "Set to ON to build the internal Qt launcher" ON) option(ENABLE_QT "Set to ON to build the internal Qt launcher" ON)
@ -562,16 +561,6 @@ configure_file (
add_subdirectory(3rdparty) add_subdirectory(3rdparty)
add_subdirectory(utils) add_subdirectory(utils)
if(ENABLE_TESTS)
# enable CTest / make test target
message(STATUS "Tests: ENABLED")
include (Dart)
enable_testing()
else()
message(STATUS "Tests: DISABLED")
endif(ENABLE_TESTS)
add_subdirectory(src) add_subdirectory(src)
add_subdirectory(icons) add_subdirectory(icons)
add_subdirectory(man) add_subdirectory(man)
@ -594,4 +583,5 @@ ADD_CUSTOM_TARGET(uninstall
# The test suite. # The test suite.
enable_testing()
add_subdirectory(test_suite EXCLUDE_FROM_ALL) add_subdirectory(test_suite EXCLUDE_FROM_ALL)

3
src/FDM/YASim/CMakeLists.txt
View file

@ -37,7 +37,6 @@ set(SOURCES
flightgear_component(YASim "${SOURCES}") flightgear_component(YASim "${SOURCES}")
if(ENABLE_TESTS)
add_executable(yasim yasim-test.cpp ${COMMON}) add_executable(yasim yasim-test.cpp ${COMMON})
add_executable(yasim-proptest proptest.cpp ${COMMON}) add_executable(yasim-proptest proptest.cpp ${COMMON})
add_executable(yasim-atmotest yasim-atmotest.cpp Atmosphere.cpp ) add_executable(yasim-atmotest yasim-atmotest.cpp Atmosphere.cpp )
@ -46,5 +45,3 @@ target_link_libraries(yasim SimGearCore)
target_link_libraries(yasim-proptest SimGearCore) target_link_libraries(yasim-proptest SimGearCore)
install(TARGETS yasim yasim-proptest RUNTIME DESTINATION ${CMAKE_INSTALL_BINDIR}) install(TARGETS yasim yasim-proptest RUNTIME DESTINATION ${CMAKE_INSTALL_BINDIR})
endif(ENABLE_TESTS)

3
test_suite/CMakeLists.txt
View file

@ -60,6 +60,9 @@ endif()
#----------------------------------------------------------------------------- #-----------------------------------------------------------------------------
# Set up all test suites as CTests. # Set up all test suites as CTests.
# Activation.
include(Dart)
# System test suites. # System test suites.
add_test(AeroMeshSystemTests ${TESTSUITE_OUTPUT_DIR}/run_test_suite --ctest -s AeroMeshTests) add_test(AeroMeshSystemTests ${TESTSUITE_OUTPUT_DIR}/run_test_suite --ctest -s AeroMeshTests)