[Cmake-commits] [cmake-commits] king committed CMakeLists.txt 1.133 1.134

[cmake-commits at cmake.org]

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

Modified Files:
	CMakeLists.txt 
Log Message:
Test OSX_ARCHITECTURES target property

We test the property with a project that fails to link due to an
architecture mismatch between an executable and a static library.

See issue #8725.


Index: CMakeLists.txt
===================================================================
RCS file: /cvsroot/CMake/CMake/Tests/CMakeLists.txt,v
retrieving revision 1.133
retrieving revision 1.134
diff -C 2 -d -r1.133 -r1.134
*** CMakeLists.txt	20 Oct 2009 18:31:10 -0000	1.133
--- CMakeLists.txt	21 Oct 2009 17:01:17 -0000	1.134
***************
*** 78,82 ****
      ON)
    MARK_AS_ADVANCED(CTEST_TEST_CPACK)
!   IF(APPLE AND CTEST_TEST_CPACK)
      EXECUTE_PROCESS(
        COMMAND sw_vers -productVersion
--- 78,83 ----
      ON)
    MARK_AS_ADVANCED(CTEST_TEST_CPACK)
!   SET(CTEST_TEST_OSX_ARCH 0)
!   IF(APPLE)
      EXECUTE_PROCESS(
        COMMAND sw_vers -productVersion
***************
*** 88,93 ****
        MESSAGE(STATUS "OSX_VERSION='${OSX_VERSION}'")
        SET(CTEST_TEST_CPACK OFF)
      ENDIF(OSX_VERSION MATCHES "^10\\.[0123]" OR OSX_VERSION MATCHES "ProductVersion:\t10\\.[0123]")
!   ENDIF(APPLE AND CTEST_TEST_CPACK)
  
    # Use 1500 or CTEST_TEST_TIMEOUT for long test timeout value,
--- 89,96 ----
        MESSAGE(STATUS "OSX_VERSION='${OSX_VERSION}'")
        SET(CTEST_TEST_CPACK OFF)
+     ELSE(OSX_VERSION MATCHES "^10\\.[0123]" OR OSX_VERSION MATCHES "ProductVersion:\t10\\.[0123]")
+       SET(CTEST_TEST_OSX_ARCH 1)
      ENDIF(OSX_VERSION MATCHES "^10\\.[0123]" OR OSX_VERSION MATCHES "ProductVersion:\t10\\.[0123]")
!   ENDIF(APPLE)
  
    # Use 1500 or CTEST_TEST_TIMEOUT for long test timeout value,
***************
*** 134,137 ****
--- 137,145 ----
      ADD_TEST_MACRO(Policy0002 Policy0002)
    ENDIF("${CMAKE_TEST_GENERATOR}" MATCHES "Make")
+   IF(CTEST_TEST_OSX_ARCH)
+     ADD_TEST_MACRO(Architecture Architecture)
+     SET_TESTS_PROPERTIES(Architecture PROPERTIES
+       PASS_REGULAR_EXPRESSION "(file is not of required architecture|does not match cputype)")
+   ENDIF(CTEST_TEST_OSX_ARCH)
  
    SET(CMAKE_BUILD_TEST_SOURCE_DIR "${CMake_SOURCE_DIR}/Tests/COnly")