From 1412cc442e29f2a7b5c19387cf38aa2e54a8c11d Mon Sep 17 00:00:00 2001
From: David Cole <david.cole@kitware.com>
Date: Mon, 16 Nov 2009 15:35:04 -0500
Subject: [PATCH] SimpleInstall test now builds an installer package if
 CTEST_TEST_CPACK is ON at the Tests/CMakeLists.txt level.

---
 Tests/CMakeLists.txt                 | 1 +
 Tests/SimpleInstall/CMakeLists.txt   | 9 ++++++++-
 Tests/SimpleInstallS2/CMakeLists.txt | 9 ++++++++-
 3 files changed, 17 insertions(+), 2 deletions(-)

diff --git a/Tests/CMakeLists.txt b/Tests/CMakeLists.txt
index 400cfdd4a..2e5a7837f 100644
--- a/Tests/CMakeLists.txt
+++ b/Tests/CMakeLists.txt
@@ -405,6 +405,7 @@ ${CMake_BINARY_DIR}/bin/cmake -DVERSION=CVS -P ${CMake_SOURCE_DIR}/Utilities/Rel
     --build-two-config
     --build-options
     "-DCMAKE_INSTALL_PREFIX:PATH=${SimpleInstallInstallDir}"
+    "-DCTEST_TEST_CPACK:BOOL=${CTEST_TEST_CPACK}"
     --test-command   ${SimpleInstallInstallDir}/MyTest/bin/SimpleInstExe)
   LIST(APPEND TEST_BUILD_DIRS "${CMake_BINARY_DIR}/Tests/SimpleInstall")
   ADD_TEST(SimpleInstall-Stage2 ${CMAKE_CTEST_COMMAND}
diff --git a/Tests/SimpleInstall/CMakeLists.txt b/Tests/SimpleInstall/CMakeLists.txt
index 7a249d870..5fc655064 100644
--- a/Tests/SimpleInstall/CMakeLists.txt
+++ b/Tests/SimpleInstall/CMakeLists.txt
@@ -364,14 +364,21 @@ SET(CPACK_PACKAGE_EXECUTABLES "SimpleInstall" "Simple Install")
 SET(CMAKE_INSTALL_MFC_LIBRARIES 1)
 SET(CMAKE_INSTALL_DEBUG_LIBRARIES 1)
 INCLUDE(InstallRequiredSystemLibraries)
-INCLUDE(CPack)
 
 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}
   POST_BUILD
diff --git a/Tests/SimpleInstallS2/CMakeLists.txt b/Tests/SimpleInstallS2/CMakeLists.txt
index 7a249d870..5fc655064 100644
--- a/Tests/SimpleInstallS2/CMakeLists.txt
+++ b/Tests/SimpleInstallS2/CMakeLists.txt
@@ -364,14 +364,21 @@ SET(CPACK_PACKAGE_EXECUTABLES "SimpleInstall" "Simple Install")
 SET(CMAKE_INSTALL_MFC_LIBRARIES 1)
 SET(CMAKE_INSTALL_DEBUG_LIBRARIES 1)
 INCLUDE(InstallRequiredSystemLibraries)
-INCLUDE(CPack)
 
 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}
   POST_BUILD