Преглед изворни кода

ENH: take cmake-gui out of beta

Bill Hoffman пре 17 година
родитељ
комит
f24e8e9d2a
2 измењених фајлова са 3 додато и 1 уклоњено
  1. 2 0
      Source/QtDialog/CMakeLists.txt
  2. 1 1
      Source/QtDialog/QtDialogCPack.cmake.in

+ 2 - 0
Source/QtDialog/CMakeLists.txt

@@ -12,6 +12,8 @@ ELSE(NOT QT4_FOUND)
   # unless qt is static
   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
     AddCacheEntry.cxx

+ 1 - 1
Source/QtDialog/QtDialogCPack.cmake.in

@@ -2,7 +2,7 @@ SET(IS_APPLE @APPLE@)
 SET(CMAKE_PACKAGE_QTGUI @CMAKE_PACKAGE_QTGUI@)
 
 IF(CMAKE_PACKAGE_QTGUI)
-  SET(CPACK_PACKAGE_EXECUTABLES ${CPACK_PACKAGE_EXECUTABLES} "cmake-gui" "cmake-gui(beta)") 
+  SET(CPACK_PACKAGE_EXECUTABLES "cmake-gui" "CMake" ${CPACK_PACKAGE_EXECUTABLES}) 
   IF(IS_APPLE)
     # for apple install we set the install prefix to
     # / and then install