[Cmake-commits] [cmake-commits] david.cole committed CMakeLists.txt 1.53 1.54

[cmake-commits at cmake.org]

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

Modified Files:
	CMakeLists.txt 
Log Message:
BUG: Avoid running the new CPackComponents test on Windows unless the NSIS installer is available.


Index: CMakeLists.txt
===================================================================
RCS file: /cvsroot/CMake/CMake/Tests/CMakeLists.txt,v
retrieving revision 1.53
retrieving revision 1.54
diff -C 2 -d -r1.53 -r1.54
*** CMakeLists.txt	17 Jun 2008 15:39:26 -0000	1.53
--- CMakeLists.txt	19 Jun 2008 15:08:08 -0000	1.54
***************
*** 288,292 ****
      --test-command   ${SimpleInstallInstallDir}/MyTest/bin/SimpleInstExeS2)
  
!   IF(CTEST_TEST_CPACK)
      ADD_TEST(CPackComponents ${CMAKE_CTEST_COMMAND}
        --build-and-test
--- 288,312 ----
      --test-command   ${SimpleInstallInstallDir}/MyTest/bin/SimpleInstExeS2)
  
!   # By default, run the CPackComponents test if the CTEST_TEST_CPACK
!   # option is ON:
!   #
!   set(CTEST_RUN_CPackComponents ${CTEST_TEST_CPACK})
! 
!   # But on Windows, only run the CPackComponents test if the NSIS
!   # installer builder is available:
!   #
!   if(WIN32)
!     find_program(NSIS_MAKENSIS_EXECUTABLE NAMES makensis
!       PATHS [HKEY_LOCAL_MACHINE\\SOFTWARE\\NSIS]
!       DOC "makensis.exe location"
!       )
!     if(NSIS_MAKENSIS_EXECUTABLE)
!       set(CTEST_RUN_CPackComponents ON)
!     else(NSIS_MAKENSIS_EXECUTABLE)
!       set(CTEST_RUN_CPackComponents OFF)
!     endif(NSIS_MAKENSIS_EXECUTABLE)
!   endif(WIN32)
! 
!   IF(CTEST_RUN_CPackComponents)
      ADD_TEST(CPackComponents ${CMAKE_CTEST_COMMAND}
        --build-and-test
***************
*** 301,305 ****
          "-DCPackComponents_BINARY_DIR:PATH=${CMake_BINARY_DIR}/Tests/CPackComponents"
          -P "${CMake_SOURCE_DIR}/Tests/CPackComponents/VerifyResult.cmake")
!   ENDIF(CTEST_TEST_CPACK)
  
    ADD_TEST(X11  ${CMAKE_CTEST_COMMAND}
--- 321,325 ----
          "-DCPackComponents_BINARY_DIR:PATH=${CMake_BINARY_DIR}/Tests/CPackComponents"
          -P "${CMake_SOURCE_DIR}/Tests/CPackComponents/VerifyResult.cmake")
!   ENDIF(CTEST_RUN_CPackComponents)
  
    ADD_TEST(X11  ${CMAKE_CTEST_COMMAND}