[Cmake-commits] [cmake-commits] hoffman committed CMakeLists.txt 1.16.2.4 1.16.2.5 QtDialogCPack.cmake.in 1.3 1.3.2.1

[cmake-commits at cmake.org]

Update of /cvsroot/CMake/CMake/Source/QtDialog
In directory public:/mounts/ram/cvs-serv4689/Source/QtDialog

Modified Files:
      Tag: CMake-2-6
	CMakeLists.txt QtDialogCPack.cmake.in 
Log Message:
ENH: merge in a few more changes for installer on windows and cmake-gui


Index: CMakeLists.txt
===================================================================
RCS file: /cvsroot/CMake/CMake/Source/QtDialog/CMakeLists.txt,v
retrieving revision 1.16.2.4
retrieving revision 1.16.2.5
diff -C 2 -d -r1.16.2.4 -r1.16.2.5
*** CMakeLists.txt	13 Jan 2009 18:03:54 -0000	1.16.2.4
--- CMakeLists.txt	16 Feb 2009 19:06:32 -0000	1.16.2.5
***************
*** 13,16 ****
--- 13,18 ----
    IF(WIN32 AND NOT QT_CONFIG MATCHES "static")
      SET(CMAKE_PACKAGE_QTGUI FALSE)
+     MESSAGE(STATUS 
+       "WARNING: QtDialog requires a static built qt for installation.")
    ENDIF(WIN32 AND NOT QT_CONFIG MATCHES "static")
    SET(SRCS

Index: QtDialogCPack.cmake.in
===================================================================
RCS file: /cvsroot/CMake/CMake/Source/QtDialog/QtDialogCPack.cmake.in,v
retrieving revision 1.3
retrieving revision 1.3.2.1
diff -C 2 -d -r1.3 -r1.3.2.1
*** QtDialogCPack.cmake.in	19 Feb 2008 19:26:20 -0000	1.3
--- QtDialogCPack.cmake.in	16 Feb 2009 19:06:32 -0000	1.3.2.1
***************
*** 3,7 ****
  
  IF(CMAKE_PACKAGE_QTGUI)
!   SET(CPACK_PACKAGE_EXECUTABLES ${CPACK_PACKAGE_EXECUTABLES} "cmake-gui" "cmake-gui(beta)") 
    IF(IS_APPLE)
      # for apple install we set the install prefix to
--- 3,7 ----
  
  IF(CMAKE_PACKAGE_QTGUI)
!   SET(CPACK_PACKAGE_EXECUTABLES "cmake-gui" "CMake (cmake-gui)" ${CPACK_PACKAGE_EXECUTABLES}) 
    IF(IS_APPLE)
      # for apple install we set the install prefix to