[cmake-commits] hoffman committed CMakeCPack.cmake 1.10 1.11 CMakeCPackOptions.cmake.in 1.5 1.6

[cmake-commits at cmake.org]

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

Modified Files:
	CMakeCPack.cmake CMakeCPackOptions.cmake.in 
Log Message:
ENH: make it so cmake-gui only installs if qt is static on windows


Index: CMakeCPack.cmake
===================================================================
RCS file: /cvsroot/CMake/CMake/CMakeCPack.cmake,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -d -r1.10 -r1.11
--- CMakeCPack.cmake	7 Nov 2007 18:11:58 -0000	1.10
+++ CMakeCPack.cmake	9 Feb 2008 14:53:52 -0000	1.11
@@ -7,6 +7,8 @@
     MARK_AS_ADVANCED(CMAKE_INSTALL_DEBUG_LIBRARIES)
     INCLUDE(${CMake_SOURCE_DIR}/Modules/InstallRequiredSystemLibraries.cmake)
   ENDIF(EXISTS "${CMAKE_ROOT}/Modules/InstallRequiredSystemLibraries.cmake")
+  # Set the options file that needs to be included inside CMakeCPackOptions.cmake
+  SET(QT_DIALOG_CPACK_OPTIONS_FILE ${CMake_BINARY_DIR}/Source/QtDialog/QtDialogCPack.cmake)
   CONFIGURE_FILE("${CMake_SOURCE_DIR}/CMakeCPackOptions.cmake.in"
     "${CMake_BINARY_DIR}/CMakeCPackOptions.cmake" @ONLY)
   SET(CPACK_PROJECT_CONFIG_FILE "${CMake_BINARY_DIR}/CMakeCPackOptions.cmake")

Index: CMakeCPackOptions.cmake.in
===================================================================
RCS file: /cvsroot/CMake/CMake/CMakeCPackOptions.cmake.in,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -d -r1.5 -r1.6
--- CMakeCPackOptions.cmake.in	7 Feb 2008 16:43:20 -0000	1.5
+++ CMakeCPackOptions.cmake.in	9 Feb 2008 14:53:52 -0000	1.6
@@ -3,8 +3,7 @@
 # in this file.  
 
 if(CPACK_GENERATOR MATCHES "NSIS")
-  SET(BUILD_QtDialog @BUILD_QtDialog@)
-  SET(CMAKE_QT_IS_STATIC @CMAKE_QT_IS_STATIC@)
+  SET(QT_DIALOG_OPTIONS_FILE @QT_DIALOG_OPTIONS_FILE@)
   # 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")
@@ -33,11 +32,9 @@
   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")
+# include the cpack options 
+INCLUDE("@QT_DIALOG_CPACK_OPTIONS_FILE@")
 
 if(CPACK_GENERATOR MATCHES "CygwinSource")
   # when packaging source make sure the .build directory is not included