* Merge CDash/CTest configuration fixes from stable intro trunk (part 2)

git-svn-id: http://opensource.mlba-team.de/svn/xdispatch/trunk@371 9e4c620c-c391-4b63-a7fb-4924991ea895
digiverse · Mar 26, 2012 · e37a98f · e37a98f
1 parent eeeccd9
commit e37a98f
Show file tree

Hide file tree

Showing 3 changed files with 5 additions and 5 deletions.
diff --git a/CMakeLists.txt b/CMakeLists.txt
@@ -7,6 +7,11 @@ INCLUDE (CheckSymbolExists)
 project(xdispatch)
 include(package/version.cmake)
 
+# ctest config
+option(BUILD_XDISPATCH_TESTS "Enable to build the xdispatch test suite" OFF)
+include(CTest)
+enable_testing()
+
 # check if mz_tools is available
 if(NOT HAS_MZ_GLOBAL)
 
@@ -131,7 +136,6 @@ if(NOT HAVE_NATIVE_DISPATCH_H)
 endif()
 
 # custom test framework for xdispatch
-option(BUILD_XDISPATCH_TESTS "Enable to build the xdispatch test suite" OFF)
 if( BUILD_XDISPATCH_TESTS)
 	mz_add_executable(tests tests)
 endif()

diff --git a/tests/CTestConfig.cmake → CTestConfig.cmake b/tests/CTestConfig.cmake → CTestConfig.cmake
diff --git a/tests/CMakeLists.txt b/tests/CMakeLists.txt
@@ -1,10 +1,6 @@
 # tests for xdispatch
 mz_add_library(munit munit)
 
-# xdispatch tests are opt-in
-include(CTest)
-enable_testing()
-
 # define file groups
 file(GLOB TESTSRCS *.c *.h cxx_*.cpp dispatch_*.cpp cross_blocks.cpp)
 file(GLOB SHIMS shims/*.c shims/*.h)