[cmake-commits] hoffman committed CMakeCPackOptions.cmake.in 1.4 1.5

[cmake-commits at cmake.org]

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

Modified Files:
	CMakeCPackOptions.cmake.in 
Log Message:
ENH: for windows only allow a static qt for install and NSIS of cmake-gui


Index: CMakeCPackOptions.cmake.in
===================================================================
RCS file: /cvsroot/CMake/CMake/CMakeCPackOptions.cmake.in,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -d -r1.4 -r1.5
--- CMakeCPackOptions.cmake.in	15 Jan 2008 22:02:44 -0000	1.4
+++ CMakeCPackOptions.cmake.in	7 Feb 2008 16:43:20 -0000	1.5
@@ -1,4 +1,10 @@
+# This file is configured at cmake time, and loaded at cpack time.
+# To pass variables to cpack from cmake, they must be configured
+# in this file.  
+
 if(CPACK_GENERATOR MATCHES "NSIS")
+  SET(BUILD_QtDialog @BUILD_QtDialog@)
+  SET(CMAKE_QT_IS_STATIC @CMAKE_QT_IS_STATIC@)
   # set the install/unistall icon used for the installer itself
   # There is a bug in NSI that does not handle full unix paths properly. 
   SET(CPACK_NSIS_MUI_ICON "@CMake_SOURCE_DIR@/Utilities/Release\\CMakeLogo.ico")
@@ -27,6 +33,10 @@
   SET(CPACK_NSIS_URL_INFO_ABOUT "http:\\\\www.kitware.com")
   SET(CPACK_NSIS_CONTACT @CPACK_PACKAGE_CONTACT@)
   SET(CPACK_NSIS_MODIFY_PATH ON)
+  # only package cmake-gui if QT is static on windows
+  IF(BUILD_QtDialog AND CMAKE_QT_IS_STATIC)
+    SET(CPACK_PACKAGE_EXECUTABLES ${CPACK_PACKAGE_EXECUTABLES} "cmake-gui" "cmake-gui(beta)") 
+  ENDIF(BUILD_QtDialog AND CMAKE_QT_IS_STATIC)
 endif(CPACK_GENERATOR MATCHES "NSIS")
 
 if(CPACK_GENERATOR MATCHES "CygwinSource")