cmake variables have been renamed

mpictor · mpictor · commit 347df4f231f0 · 2012-03-26T19:56:02.000-04:00
diff --git a/CMakeLists.txt b/CMakeLists.txt
@@ -294,9 +294,9 @@ ADD_SUBDIRECTORY(src/cldai)
 ADD_SUBDIRECTORY(src/clutils)
 ADD_SUBDIRECTORY(include)
 ADD_SUBDIRECTORY(data)
-IF(ENABLE_TESTING)
+IF(SCL_ENABLE_TESTING)
   ADD_SUBDIRECTORY( test )
-ENDIF(ENABLE_TESTING)
+ENDIF(SCL_ENABLE_TESTING)
 ADD_SUBDIRECTORY(doc)
 
 # this is for testing - 'make core' builds everything that isn't generated
diff --git a/ctest_matrix.cmake b/ctest_matrix.cmake
@@ -8,14 +8,14 @@ set( CTEST_MEMORYCHECK_COMMAND /usr/bin/valgrind )
 set( CTEST_INITIAL_CACHE "
 SITE:STRING=${CTEST_SITE}
 BUILDNAME:STRING=${CTEST_BUILD_NAME}
-ENABLE_TESTING:BOOL=ON
-CMAKE_BUILD_TYPE:STRING=Debug
+SCL_ENABLE_TESTING:BOOL=ON
+SCL_BUILD_TYPE:STRING=Debug
 ")
 
 
 ctest_start(matrix)
 ctest_empty_binary_directory(${CTEST_BINARY_DIRECTORY})
-ctest_configure( BUILD "${CTEST_BINARY_DIRECTORY}" OPTIONS -DENABLE_TESTING=ON )
+ctest_configure( BUILD "${CTEST_BINARY_DIRECTORY}" OPTIONS -DSCL_ENABLE_TESTING=ON )
 ctest_build( BUILD "${CTEST_BINARY_DIRECTORY}" )
 message("running tests")
 ctest_test( BUILD "${CTEST_BINARY_DIRECTORY}" INCLUDE_LABEL "cpp_schema_....*" )
diff --git a/data/CMakeLists.txt b/data/CMakeLists.txt
@@ -2,7 +2,7 @@
 #this sets a property so that the target doesn't get built by 'make' or 'make all'
 #useful when testing generation of schema code/compiling schem libs/etc
 FUNCTION( TESTABLE_TARGET target )
-    if(ENABLE_TESTING)
+    if(SCL_ENABLE_TESTING)
         set_target_properties( ${target} PROPERTIES EXCLUDE_FROM_ALL ON )
     endif()
 ENDFUNCTION( TESTABLE_TARGET )
diff --git a/run_ctest.cmake b/run_ctest.cmake
@@ -8,8 +8,8 @@ set( CTEST_MEMORYCHECK_COMMAND /usr/bin/valgrind )
 set( CTEST_INITIAL_CACHE "
 SITE:STRING=${CTEST_SITE}
 BUILDNAME:STRING=${CTEST_BUILD_NAME}
-ENABLE_TESTING:BOOL=ON
-CMAKE_BUILD_TYPE:STRING=Debug
+SCL_ENABLE_TESTING:BOOL=ON
+SCL_BUILD_TYPE:STRING=Debug
 ")
 
 
@@ -94,7 +94,7 @@ set(CTEST_BUILD_FLAGS "-j${PROCESSOR_COUNT}")
 ctest_start(Experimental)
 ctest_empty_binary_directory(${CTEST_BINARY_DIRECTORY})
 
-ctest_configure( BUILD "${CTEST_BINARY_DIRECTORY}" APPEND OPTIONS -DENABLE_TESTING=ON )
+ctest_configure( BUILD "${CTEST_BINARY_DIRECTORY}" APPEND OPTIONS -DSCL_ENABLE_TESTING=ON )
 SUBMIT_TEST( Configure )
 ctest_build( BUILD "${CTEST_BINARY_DIRECTORY}" APPEND )
 SUBMIT_TEST( Build )
