[Cmake-commits] [cmake-commits] david.cole committed CMakeLists.txt 1.79 1.80

[cmake-commits at cmake.org]

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

Modified Files:
	CMakeLists.txt 
Log Message:
BUG: Fix issue #7833: Add file extension handling to CPack generated installers for OSXX11 applications. Also modify the X11 test to build such an installer on Mac builds that test CPack and have X11 available. Thanks to Wes Turner for the patch.


Index: CMakeLists.txt
===================================================================
RCS file: /cvsroot/CMake/CMake/Tests/CMakeLists.txt,v
retrieving revision 1.79
retrieving revision 1.80
diff -C 2 -d -r1.79 -r1.80
*** CMakeLists.txt	5 Jan 2009 19:14:24 -0000	1.79
--- CMakeLists.txt	21 Jan 2009 16:54:30 -0000	1.80
***************
*** 408,412 ****
    ENDIF(CTEST_RUN_CPackComponents)
  
!   ADD_TEST(X11  ${CMAKE_CTEST_COMMAND}
      --build-and-test
      "${CMake_SOURCE_DIR}/Tests/X11"
--- 408,418 ----
    ENDIF(CTEST_RUN_CPackComponents)
  
!   IF(CTEST_TEST_CPACK)
!     SET(X11_build_target_arg --build-target package)
!   ELSE(CTEST_TEST_CPACK)
!     SET(X11_build_target_arg)
!   ENDIF(CTEST_TEST_CPACK)
! 
!   ADD_TEST(X11 ${CMAKE_CTEST_COMMAND}
      --build-and-test
      "${CMake_SOURCE_DIR}/Tests/X11"
***************
*** 416,419 ****
--- 422,426 ----
      --build-makeprogram ${CMAKE_TEST_MAKEPROGRAM}
      --build-two-config
+     ${X11_build_target_arg}
      --test-command  UseX11)
    LIST(APPEND TEST_BUILD_DIRS "${CMake_BINARY_DIR}/Tests/X11")