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

[cmake-commits at cmake.org]

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

Modified Files:
	CMakeLists.txt 
Log Message:
BUG: Avoid trying to package the X11 test on Windows when there is no NSIS installer available.


Index: CMakeLists.txt
===================================================================
RCS file: /cvsroot/CMake/CMake/Tests/CMakeLists.txt,v
retrieving revision 1.80
retrieving revision 1.81
diff -C 2 -d -r1.80 -r1.81
*** CMakeLists.txt	21 Jan 2009 16:54:30 -0000	1.80
--- CMakeLists.txt	22 Jan 2009 15:22:30 -0000	1.81
***************
*** 373,376 ****
--- 373,377 ----
    #
    set(CTEST_RUN_CPackComponents ${CTEST_TEST_CPACK})
+   set(CTEST_package_X11_TEST ${CTEST_TEST_CPACK})
  
    # But on Windows, only run the CPackComponents test if the NSIS
***************
*** 386,389 ****
--- 387,391 ----
      else(NSIS_MAKENSIS_EXECUTABLE)
        set(CTEST_RUN_CPackComponents OFF)
+       set(CTEST_package_X11_TEST OFF)
      endif(NSIS_MAKENSIS_EXECUTABLE)
    endif(WIN32)
***************
*** 408,416 ****
    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}
--- 410,418 ----
    ENDIF(CTEST_RUN_CPackComponents)
  
!   IF(CTEST_package_X11_TEST)
      SET(X11_build_target_arg --build-target package)
!   ELSE(CTEST_package_X11_TEST)
      SET(X11_build_target_arg)
!   ENDIF(CTEST_package_X11_TEST)
  
    ADD_TEST(X11 ${CMAKE_CTEST_COMMAND}