Changeset 10188 for code/trunk

Timestamp:

Jan 10, 2015, 4:39:15 PM (10 years ago)

Author:

landauf

Message:

change cmake policy in order to avoid warning because we currently can't solve this in another way.
added new build target to build tests without executing them.

Location:

code/trunk/test

Files:

• CMakeLists.txt (modified) (1 diff)
• core/CMakeLists.txt (modified) (1 diff)
• util/CMakeLists.txt (modified) (1 diff)

code/trunk/test/CMakeLists.txt

@@ -34 +34 @@
 ENABLE_TESTING()
 
+# A target to execute tests. This override the native 'test' target of cmake and allows us to
+# define dependences (i.e. to let cmake build the tests before executing them)
+IF (POLICY CMP0037)
+  CMAKE_POLICY(PUSH)
+  CMAKE_POLICY(SET CMP0037 OLD) # we currently have to override the original 'test' target until cmake provides a better way to define dependencies to the test target
+ENDIF()
 ADD_CUSTOM_TARGET(test COMMAND ${CMAKE_CTEST_COMMAND} "$(ARGS)" COMMENT "Running tests")
+IF (POLICY CMP0037)
+  CMAKE_POLICY(POP) # restore policy settings
+ENDIF()
+
+# A target to build all tests
+ADD_CUSTOM_TARGET(all_tests)
+ADD_DEPENDENCIES(test all_tests) # build tests before executing them
 
 CONFIGURE_FILE("CTestCustom.cmake" "CTestCustom.cmake" @ONLY)

code/trunk/test/core/CMakeLists.txt

@@ -28 +28 @@
     object/WeakPtrTest.cc
 )
-ADD_DEPENDENCIES(test core_test)
+ADD_DEPENDENCIES(all_tests core_test)
 
 ADD_TEST(core_test ${CMAKE_RUNTIME_OUTPUT_DIRECTORY}/core_test --gtest_output=xml)

code/trunk/test/util/CMakeLists.txt

@@ -31 +31 @@
     output/SubcontextOutputListenerTest.cc
 )
-ADD_DEPENDENCIES(test util_test)
+ADD_DEPENDENCIES(all_tests util_test)
 
 ADD_TEST(util_test ${CMAKE_RUNTIME_OUTPUT_DIRECTORY}/util_test --gtest_output=xml)