[Cmake-commits] [cmake-commits] king committed CMakeLists.txt 1.122 1.123

cmake-commits at cmake.org cmake-commits at cmake.org
Wed Oct 7 16:11:54 EDT 2009


Update of /cvsroot/CMake/CMake/Tests
In directory public:/mounts/ram/cvs-serv27221/Tests

Modified Files:
	CMakeLists.txt 
Log Message:
Make Complex test of CMakeLib more optional

Previously we passed inputs to the decision to each Complex test and let
the test source decide.  This commit moves the decision out of the tests
and makes it an option() in their source.  This makes it possible to
build the Complex tests from outside the CMake test tree.


Index: CMakeLists.txt
===================================================================
RCS file: /cvsroot/CMake/CMake/Tests/CMakeLists.txt,v
retrieving revision 1.122
retrieving revision 1.123
diff -C 2 -d -r1.122 -r1.123
*** CMakeLists.txt	7 Oct 2009 10:33:09 -0000	1.122
--- CMakeLists.txt	7 Oct 2009 20:11:51 -0000	1.123
***************
*** 487,490 ****
--- 487,494 ----
    ENDIF(CMAKE_BASE_NAME MATCHES "^como$")
    IF(NOT COMPILER_IS_COMO)
+     SET(COMPLEX_TEST_CMAKELIB 1)
+     IF(CMAKE_TEST_DIFFERENT_GENERATOR OR CMAKE_TEST_SYSTEM_LIBRARIES)
+       SET(COMPLEX_TEST_CMAKELIB 0)
+     ENDIF(CMAKE_TEST_DIFFERENT_GENERATOR OR CMAKE_TEST_SYSTEM_LIBRARIES)
      ADD_TEST(complex  ${CMAKE_CTEST_COMMAND}
        --build-and-test
***************
*** 498,503 ****
        --build-exe-dir "${CMake_BINARY_DIR}/Tests/Complex/bin"
        --build-options
!       -DCMAKE_TEST_DIFFERENT_GENERATOR:BOOL=${CMAKE_TEST_DIFFERENT_GENERATOR}
!       -DCMAKE_TEST_SYSTEM_LIBRARIES:BOOL=${CMAKE_TEST_SYSTEM_LIBRARIES}
        -DCMAKE_BUILD_TYPE:STRING=${CMAKE_BUILD_TYPE}
        --test-command complex
--- 502,506 ----
        --build-exe-dir "${CMake_BINARY_DIR}/Tests/Complex/bin"
        --build-options
!       -DCOMPLEX_TEST_CMAKELIB:BOOL=${COMPLEX_TEST_CMAKELIB}
        -DCMAKE_BUILD_TYPE:STRING=${CMAKE_BUILD_TYPE}
        --test-command complex
***************
*** 514,519 ****
        --build-exe-dir "${CMake_BINARY_DIR}/Tests/ComplexOneConfig/bin"
        --build-options
!       -DCMAKE_TEST_DIFFERENT_GENERATOR:BOOL=${CMAKE_TEST_DIFFERENT_GENERATOR}
!       -DCMAKE_TEST_SYSTEM_LIBRARIES:BOOL=${CMAKE_TEST_SYSTEM_LIBRARIES}
        -DCMAKE_BUILD_TYPE:STRING=${CMAKE_BUILD_TYPE}
        --test-command complex)
--- 517,521 ----
        --build-exe-dir "${CMake_BINARY_DIR}/Tests/ComplexOneConfig/bin"
        --build-options
!       -DCOMPLEX_TEST_CMAKELIB:BOOL=${COMPLEX_TEST_CMAKELIB}
        -DCMAKE_BUILD_TYPE:STRING=${CMAKE_BUILD_TYPE}
        --test-command complex)



More information about the Cmake-commits mailing list