diff options
| -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 | ||||
| -rw-r--r-- | Utilities/Release/dashmacmini2_release.cmake | 2 | ||||
| -rw-r--r-- | Utilities/Release/dashmacmini5_release.cmake | 2 | ||||
| -rw-r--r-- | Utilities/Release/release_cmake.cmake | 2 |
7 files changed, 3 insertions, 19 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 diff --git a/Utilities/Release/dashmacmini2_release.cmake b/Utilities/Release/dashmacmini2_release.cmake index 89c99bc..6a27119 100644 --- a/Utilities/Release/dashmacmini2_release.cmake +++ b/Utilities/Release/dashmacmini2_release.cmake @@ -5,7 +5,7 @@ set(INSTALL_PREFIX /) set(HOST dashmacmini2) set(MAKE_PROGRAM "make") set(MAKE "${MAKE_PROGRAM} -j2") -set(CPACK_BINARY_GENERATORS "PackageMaker TGZ TZ") +set(CPACK_BINARY_GENERATORS "DragNDrop TGZ TZ") set(INITIAL_CACHE " CMAKE_BUILD_TYPE:STRING=Release CMAKE_OSX_ARCHITECTURES:STRING=ppc;i386 diff --git a/Utilities/Release/dashmacmini5_release.cmake b/Utilities/Release/dashmacmini5_release.cmake index f777718..16a30b3 100644 --- a/Utilities/Release/dashmacmini5_release.cmake +++ b/Utilities/Release/dashmacmini5_release.cmake @@ -5,7 +5,7 @@ set(INSTALL_PREFIX /) set(HOST dashmacmini5) set(MAKE_PROGRAM "make") set(MAKE "${MAKE_PROGRAM} -j5") -set(CPACK_BINARY_GENERATORS "PackageMaker TGZ TZ") +set(CPACK_BINARY_GENERATORS "DragNDrop TGZ TZ") set(CPACK_SOURCE_GENERATORS "TGZ TZ") set(INITIAL_CACHE " CMAKE_USE_OPENSSL:BOOL=ON diff --git a/Utilities/Release/release_cmake.cmake b/Utilities/Release/release_cmake.cmake index 7a1652d..4c4dd8a 100644 --- a/Utilities/Release/release_cmake.cmake +++ b/Utilities/Release/release_cmake.cmake @@ -99,7 +99,7 @@ foreach(gen ${generators}) if("${gen}" STREQUAL "STGZ") set(SUFFIXES ${SUFFIXES} "*.sh") endif() - if("${gen}" STREQUAL "PackageMaker") + if("${gen}" STREQUAL "DragNDrop") set(SUFFIXES ${SUFFIXES} "*.dmg") endif() if("${gen}" STREQUAL "TBZ2") |