From e8a0e90133da84e552efc1852f9f1e589b250ed3 Mon Sep 17 00:00:00 2001
From: David Cole <david.cole@kitware.com>
Date: Thu, 22 Jan 2009 10:22:30 -0500
Subject: BUG: Avoid trying to package the X11 test on Windows when there is no
 NSIS installer available.

---
 Tests/CMakeLists.txt | 8 +++++---
 1 file changed, 5 insertions(+), 3 deletions(-)

diff --git a/Tests/CMakeLists.txt b/Tests/CMakeLists.txt
index 9e59660..43db525 100644
--- a/Tests/CMakeLists.txt
+++ b/Tests/CMakeLists.txt
@@ -372,6 +372,7 @@ ${CMake_BINARY_DIR}/bin/cmake -DVERSION=CVS -P ${CMake_SOURCE_DIR}/Utilities/Rel
   # option is ON:
   #
   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
   # installer builder is available:
@@ -385,6 +386,7 @@ ${CMake_BINARY_DIR}/bin/cmake -DVERSION=CVS -P ${CMake_SOURCE_DIR}/Utilities/Rel
       set(CTEST_RUN_CPackComponents ON)
     else(NSIS_MAKENSIS_EXECUTABLE)
       set(CTEST_RUN_CPackComponents OFF)
+      set(CTEST_package_X11_TEST OFF)
     endif(NSIS_MAKENSIS_EXECUTABLE)
   endif(WIN32)
 
@@ -407,11 +409,11 @@ ${CMake_BINARY_DIR}/bin/cmake -DVERSION=CVS -P ${CMake_SOURCE_DIR}/Utilities/Rel
     LIST(APPEND TEST_BUILD_DIRS "${CMake_BINARY_DIR}/Tests/CPackComponents")
   ENDIF(CTEST_RUN_CPackComponents)
 
-  IF(CTEST_TEST_CPACK)
+  IF(CTEST_package_X11_TEST)
     SET(X11_build_target_arg --build-target package)
-  ELSE(CTEST_TEST_CPACK)
+  ELSE(CTEST_package_X11_TEST)
     SET(X11_build_target_arg)
-  ENDIF(CTEST_TEST_CPACK)
+  ENDIF(CTEST_package_X11_TEST)
 
   ADD_TEST(X11 ${CMAKE_CTEST_COMMAND}
     --build-and-test
-- 
cgit v0.12