Commit 07bac371 authored by Bill Hoffman's avatar Bill Hoffman
Browse files

ENH: merge in a few more changes for installer on windows and cmake-gui

parent f5d8a07e
...@@ -11,18 +11,19 @@ if(CPACK_GENERATOR MATCHES "NSIS") ...@@ -11,18 +11,19 @@ if(CPACK_GENERATOR MATCHES "NSIS")
SET(CPACK_PACKAGE_ICON "@CMake_SOURCE_DIR@/Utilities/Release\\CMakeInstall.bmp") SET(CPACK_PACKAGE_ICON "@CMake_SOURCE_DIR@/Utilities/Release\\CMakeInstall.bmp")
# tell cpack to create links to the doc files # tell cpack to create links to the doc files
SET(CPACK_NSIS_MENU_LINKS SET(CPACK_NSIS_MENU_LINKS
"doc/cmake-@CMake_VERSION_MAJOR@.@CMake_VERSION_MINOR@/CMakeSetup.html" "CMakeSetup Help" "doc/cmake-@CMake_VERSION_MAJOR@.@CMake_VERSION_MINOR@/cmake-gui.html" "cmake-gui Help"
"doc/cmake-@CMake_VERSION_MAJOR@.@CMake_VERSION_MINOR@/cmake.html" "CMake Help" "doc/cmake-@CMake_VERSION_MAJOR@.@CMake_VERSION_MINOR@/cmake.html" "CMake Help"
"doc/cmake-@CMake_VERSION_MAJOR@.@CMake_VERSION_MINOR@/cmake-properties.html" "doc/cmake-@CMake_VERSION_MAJOR@.@CMake_VERSION_MINOR@/cmake-properties.html"
"CMake Properties and Variables Help" "CMake Properties and Variables Help"
"doc/cmake-@CMake_VERSION_MAJOR@.@CMake_VERSION_MINOR@/ctest.html" "CTest Help" "doc/cmake-@CMake_VERSION_MAJOR@.@CMake_VERSION_MINOR@/ctest.html" "CTest Help"
"doc/cmake-@CMake_VERSION_MAJOR@.@CMake_VERSION_MINOR@/cmake-modules.html" "CMake Modules Help" "doc/cmake-@CMake_VERSION_MAJOR@.@CMake_VERSION_MINOR@/cmake-modules.html" "CMake Modules Help"
"doc/cmake-@CMake_VERSION_MAJOR@.@CMake_VERSION_MINOR@/cmake-commands.html" "CMake Commands Help" "doc/cmake-@CMake_VERSION_MAJOR@.@CMake_VERSION_MINOR@/cmake-commands.html" "CMake Commands Help"
"doc/cmake-@CMake_VERSION_MAJOR@.@CMake_VERSION_MINOR@/CMakeSetup.html" "CMakeSetup Help"
"doc/cmake-@CMake_VERSION_MAJOR@.@CMake_VERSION_MINOR@/cpack.html" "CPack Help" "doc/cmake-@CMake_VERSION_MAJOR@.@CMake_VERSION_MINOR@/cpack.html" "CPack Help"
"http://www.cmake.org" "CMake Web Site" "http://www.cmake.org" "CMake Web Site"
) )
# tell cpack the executables you want in the start menu as links # tell cpack the executables you want in the start menu as links
SET(CPACK_PACKAGE_EXECUTABLES "CMakeSetup" "CMake" ) SET(CPACK_PACKAGE_EXECUTABLES "CMakeSetup" "CMakeSetup(deprecated)" )
# tell cpack to create a desktop link to CMakeSetup # tell cpack to create a desktop link to CMakeSetup
SET(CPACK_CREATE_DESKTOP_LINKS "CMakeSetup") SET(CPACK_CREATE_DESKTOP_LINKS "CMakeSetup")
SET(CPACK_NSIS_INSTALLED_ICON_NAME "bin\\CMakeSetup.exe") SET(CPACK_NSIS_INSTALLED_ICON_NAME "bin\\CMakeSetup.exe")
......
...@@ -354,7 +354,7 @@ ENDMACRO (CMAKE_BUILD_UTILITIES) ...@@ -354,7 +354,7 @@ ENDMACRO (CMAKE_BUILD_UTILITIES)
SET(CMake_VERSION_MAJOR 2) SET(CMake_VERSION_MAJOR 2)
SET(CMake_VERSION_MINOR 6) SET(CMake_VERSION_MINOR 6)
SET(CMake_VERSION_PATCH 3) SET(CMake_VERSION_PATCH 3)
SET(CMake_VERSION_RC 13) SET(CMake_VERSION_RC 14)
# CVS versions are odd, if this is an odd minor version # CVS versions are odd, if this is an odd minor version
# then set the CMake_VERSION_DATE variable # then set the CMake_VERSION_DATE variable
IF("${CMake_VERSION_MINOR}" MATCHES "[13579]$") IF("${CMake_VERSION_MINOR}" MATCHES "[13579]$")
......
Changes in CMake 2.6.3 RC 14
- Take cmake-gui out of beta for windows installer
Changes in CMake 2.6.3 RC 13 Changes in CMake 2.6.3 RC 13
- Fix cmake can not find cmake when run on windows from PATH - Fix cmake can not find cmake when run on windows from PATH
- Fix #8378 FILEPATH cache UNC paths in list removed extra / - Fix #8378 FILEPATH cache UNC paths in list removed extra /
......
...@@ -12,6 +12,8 @@ ELSE(NOT QT4_FOUND) ...@@ -12,6 +12,8 @@ ELSE(NOT QT4_FOUND)
# unless qt is static # unless qt is static
IF(WIN32 AND NOT QT_CONFIG MATCHES "static") IF(WIN32 AND NOT QT_CONFIG MATCHES "static")
SET(CMAKE_PACKAGE_QTGUI FALSE) SET(CMAKE_PACKAGE_QTGUI FALSE)
MESSAGE(STATUS
"WARNING: QtDialog requires a static built qt for installation.")
ENDIF(WIN32 AND NOT QT_CONFIG MATCHES "static") ENDIF(WIN32 AND NOT QT_CONFIG MATCHES "static")
SET(SRCS SET(SRCS
AddCacheEntry.cxx AddCacheEntry.cxx
......
...@@ -2,7 +2,7 @@ SET(IS_APPLE @APPLE@) ...@@ -2,7 +2,7 @@ SET(IS_APPLE @APPLE@)
SET(CMAKE_PACKAGE_QTGUI @CMAKE_PACKAGE_QTGUI@) SET(CMAKE_PACKAGE_QTGUI @CMAKE_PACKAGE_QTGUI@)
IF(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 (cmake-gui)" ${CPACK_PACKAGE_EXECUTABLES})
IF(IS_APPLE) IF(IS_APPLE)
# for apple install we set the install prefix to # for apple install we set the install prefix to
# / and then install # / and then install
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment