Commits

Shlomi Fish committed 719e2a1

Adapt to CMake-3.0.0-rc3.

Comments (0)

Files changed (2)

black-hole-solitaire/c-solver/CMakeLists.txt

     ARGS "config.h.in"
 )
 
+ENABLE_TESTING()
+
+ADD_TEST(
+    NAME perl_run_tests
+    COMMAND "perl" "${CMAKE_CURRENT_SOURCE_DIR}/run-tests.pl"
+)
+
 ADD_CUSTOM_TARGET(
-    "test"
+    "check"
     "perl" "${CMAKE_CURRENT_SOURCE_DIR}/run-tests.pl"
 )
 
-ADD_DEPENDENCIES(
-    "test"
-    "all"
-)
-
 INCLUDE(CPack)

black-hole-solitaire/c-solver/Tatzer

 # This cache is sometimes causing problems.
 unlink("CMakeCache.txt");
 
+# Removed:
+# ($test_suite ? ("-DFCS_WITH_TEST_SUITE=1") : ()),
+
 my @cmd= ("cmake",
     "-DCMAKE_BUILD_TYPE=$build_type",
     "-DBHS_STATE_STORAGE=BHS_STATE_STORAGE_$state_storage",
     "-DDATADIR=$prefix/share",
     ((!$build_static_lib) ? ("-DBUILD_STATIC_LIBRARY=") : ()),
     (defined($pack_size) ? ("-DFCS_IA_PACK_SIZE=$pack_size") : ()),
-    ($test_suite ? ("-DFCS_WITH_TEST_SUITE=1") : ()),
     (defined($cpu_arch) ? ("-DCPU_ARCH=$cpu_arch") : ()),
     ($omit_frame ? "-DOPTIMIZATION_OMIT_FRAME_POINTER=1" : ()),
     ($state_storage_libavl2_tree