[Cmake-commits] [cmake-commits] david.cole committed CMakeLists.txt 1.103 1.104

[cmake-commits at cmake.org]

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

Modified Files:
	CMakeLists.txt 
Log Message:
SimpleInstall test now builds an installer package if CTEST_TEST_CPACK is ON at the Tests/CMakeLists.txt level.


Index: CMakeLists.txt
===================================================================
RCS file: /cvsroot/CMake/CMake/Tests/SimpleInstall/CMakeLists.txt,v
retrieving revision 1.103
retrieving revision 1.104
diff -C 2 -d -r1.103 -r1.104
*** CMakeLists.txt	1 May 2009 13:45:43 -0000	1.103
--- CMakeLists.txt	16 Nov 2009 20:35:04 -0000	1.104
***************
*** 365,376 ****
  SET(CMAKE_INSTALL_DEBUG_LIBRARIES 1)
  INCLUDE(InstallRequiredSystemLibraries)
- INCLUDE(CPack)
  
  IF(CTEST_TEST_CPACK)
    SET(PACKAGE_TARGET --build-target package)
  ELSE(CTEST_TEST_CPACK)
    SET(PACKAGE_TARGET)
  ENDIF(CTEST_TEST_CPACK)
  
  ADD_CUSTOM_COMMAND(
    TARGET ${install_target}
--- 365,383 ----
  SET(CMAKE_INSTALL_DEBUG_LIBRARIES 1)
  INCLUDE(InstallRequiredSystemLibraries)
  
  IF(CTEST_TEST_CPACK)
    SET(PACKAGE_TARGET --build-target package)
+ 
+   # Avoid settings that require the .zip file command line tools...
+   # (just build an NSIS installer without component support)
+   #
+   SET(CPACK_BINARY_ZIP OFF)
+   SET(CPACK_MONOLITHIC_INSTALL ON)
  ELSE(CTEST_TEST_CPACK)
    SET(PACKAGE_TARGET)
  ENDIF(CTEST_TEST_CPACK)
  
+ INCLUDE(CPack)
+ 
  ADD_CUSTOM_COMMAND(
    TARGET ${install_target}