diff options
| author | Brad King <brad.king@kitware.com> | 2014-05-08 17:38:33 (GMT) |
|---|---|---|
| committer | Brad King <brad.king@kitware.com> | 2014-05-08 18:13:20 (GMT) |
| commit | dc3c210244d93a4828423a336cf8032ab1300fe8 (patch) | |
| tree | 491daf9c9c6cdfe15e85e10830645404554990fb /Source/QtDialog | |
| parent | d91c0f7a3f406dcf5c803e86ad6ac2e75ec0b85f (diff) | |
| download | CMake-dc3c210244d93a4828423a336cf8032ab1300fe8.zip CMake-dc3c210244d93a4828423a336cf8032ab1300fe8.tar.gz CMake-dc3c210244d93a4828423a336cf8032ab1300fe8.tar.bz2 | |
OS X: Package with DragNDrop instead of PackageMaker
Use the CPack DragNDrop generator instead of the deprecated PackageMaker
tool to package CMake itself. This provides an installation experience
that is more consistent with other products on OS X and allows users to
select the destination directory easily. It also avoids installing
"/private/var/db/receipts/com.Kitware.CMake.*" receipts that must be
removed by "pkgutil --forget com.Kitware.CMake" before another version
of CMake can be installed.
The DragNDrop installer does not support a post-flight script, so drop
our configuration of it. The cmake-gui has an option for installing
symbolic links to enable command-line use. In practice users may simply
add "/Applications/CMake.app/Contents/bin" to their PATH instead.
Diffstat (limited to 'Source/QtDialog')
| -rw-r--r-- | Source/QtDialog/CMakeLists.txt | 8 | ||||
| -rw-r--r-- | Source/QtDialog/QtDialogCPack.cmake.in | 3 | ||||
| -rwxr-xr-x | Source/QtDialog/postflight.sh.in | 3 | ||||
| -rwxr-xr-x | Source/QtDialog/postupgrade.sh.in | 2 |
4 files changed, 0 insertions, 16 deletions
diff --git a/Source/QtDialog/CMakeLists.txt b/Source/QtDialog/CMakeLists.txt index 7885a0c..8da88c1 100644 --- a/Source/QtDialog/CMakeLists.txt +++ b/Source/QtDialog/CMakeLists.txt @@ -154,14 +154,6 @@ if(UNIX) endif() if(APPLE) - set(CMAKE_POSTFLIGHT_SCRIPT - "${CMake_BINARY_DIR}/Source/QtDialog/postflight.sh") - set(CMAKE_POSTUPGRADE_SCRIPT - "${CMake_BINARY_DIR}/Source/QtDialog/postupgrade.sh") - configure_file("${CMake_SOURCE_DIR}/Source/QtDialog/postflight.sh.in" - "${CMake_BINARY_DIR}/Source/QtDialog/postflight.sh") - configure_file("${CMake_SOURCE_DIR}/Source/QtDialog/postupgrade.sh.in" - "${CMake_BINARY_DIR}/Source/QtDialog/postupgrade.sh") install(CODE "execute_process(COMMAND ln -s \"../MacOS/CMake\" cmake-gui WORKING_DIRECTORY \$ENV{DESTDIR}\${CMAKE_INSTALL_PREFIX}/bin)") endif() diff --git a/Source/QtDialog/QtDialogCPack.cmake.in b/Source/QtDialog/QtDialogCPack.cmake.in index 3196471..7ae8605 100644 --- a/Source/QtDialog/QtDialogCPack.cmake.in +++ b/Source/QtDialog/QtDialogCPack.cmake.in @@ -9,9 +9,6 @@ if(CMAKE_PACKAGE_QTGUI) # / and then install # cmake into the bundle for cmake-gui and must use DESTDIR set(CPACK_SET_DESTDIR TRUE) - # we also want to run post install stuff to setup command line - set(CPACK_POSTFLIGHT_SCRIPT "@CMAKE_POSTFLIGHT_SCRIPT@") - set(CPACK_POSTUPGRADE_SCRIPT "@CMAKE_POSTUPGRADE_SCRIPT@") endif() endif() diff --git a/Source/QtDialog/postflight.sh.in b/Source/QtDialog/postflight.sh.in deleted file mode 100755 index 0b96889..0000000 --- a/Source/QtDialog/postflight.sh.in +++ /dev/null @@ -1,3 +0,0 @@ -#!/bin/bash -"$2@CMAKE_INSTALL_SUBDIR@/CMake.app/Contents/MacOS/CMake" --mac-install -exit 0 diff --git a/Source/QtDialog/postupgrade.sh.in b/Source/QtDialog/postupgrade.sh.in deleted file mode 100755 index 06bd986..0000000 --- a/Source/QtDialog/postupgrade.sh.in +++ /dev/null @@ -1,2 +0,0 @@ -#!/bin/bash -exit 0 |