[Cmake-commits] [cmake-commits] david.cole committed CMakeLists.txt 1.135 1.136

[cmake-commits at cmake.org]

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

Modified Files:
	CMakeLists.txt 
Log Message:
Turn on the NSIS binary for the CPackComponents test if NSIS is found. Should increase coverage of the NSIS generator on the dash16 coverage dashboard.


Index: CMakeLists.txt
===================================================================
RCS file: /cvsroot/CMake/CMake/Tests/CMakeLists.txt,v
retrieving revision 1.135
retrieving revision 1.136
diff -C 2 -d -r1.135 -r1.136
*** CMakeLists.txt	22 Oct 2009 14:14:39 -0000	1.135
--- CMakeLists.txt	25 Oct 2009 21:00:51 -0000	1.136
***************
*** 424,435 ****
    set(CTEST_package_X11_TEST ${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)
--- 424,436 ----
    set(CTEST_package_X11_TEST ${CTEST_TEST_CPACK})
  
+   find_program(NSIS_MAKENSIS_EXECUTABLE NAMES makensis
+     PATHS [HKEY_LOCAL_MACHINE\\SOFTWARE\\NSIS]
+     DOC "makensis program location"
+     )
+ 
    # But on Windows, only run the CPackComponents test if the NSIS
    # installer builder is available:
    #
    if(WIN32)
      if(NSIS_MAKENSIS_EXECUTABLE)
        set(CTEST_RUN_CPackComponents ON)
***************
*** 445,448 ****
--- 446,453 ----
        set(CPackComponents_EXTRA_OPTIONS -DCPACK_BINARY_DRAGNDROP:BOOL=ON)
      endif(APPLE)
+     if(NSIS_MAKENSIS_EXECUTABLE)
+       set(CPackComponents_EXTRA_OPTIONS ${CPackComponents_EXTRA_OPTIONS}
+         -DCPACK_BINARY_NSIS:BOOL=ON)
+     endif(NSIS_MAKENSIS_EXECUTABLE)
  
      ADD_TEST(CPackComponents ${CMAKE_CTEST_COMMAND}