From 87b4c65c58f7be0f09a55134f94d2e36b25b26ec Mon Sep 17 00:00:00 2001
From: Russell Taylor <taylorrj@ornl.gov>
Date: Fri, 15 Apr 2011 21:48:17 +0000
Subject: [PATCH] For CPack Mac Installer. Re #2752.
---
Code/Mantid/Build/CMake/DarwinSetup.cmake | 2 ++
Code/Mantid/CMakeLists.txt | 2 +-
Code/Mantid/MantidPlot/FixBundle.cmake.in | 2 +-
3 files changed, 4 insertions(+), 2 deletions(-)
diff --git a/Code/Mantid/Build/CMake/DarwinSetup.cmake b/Code/Mantid/Build/CMake/DarwinSetup.cmake
index cc0312c0d96..ff6426311f8 100644
--- a/Code/Mantid/Build/CMake/DarwinSetup.cmake
+++ b/Code/Mantid/Build/CMake/DarwinSetup.cmake
@@ -29,3 +29,5 @@ set ( MACOSX_BUNDLE_ICON_FILE MantidPlot.icns )
set ( CPACK_OSX_PACKAGE_VERSION 10.6 )
set ( CPACK_POSTFLIGHT_SCRIPT ${CMAKE_SOURCE_DIR}/Installers/MacInstaller/installer_hooks/postflight )
+set ( CPACK_GENERATOR PackageMaker )
+
diff --git a/Code/Mantid/CMakeLists.txt b/Code/Mantid/CMakeLists.txt
index 91d23566eed..a8d93cbf2bd 100644
--- a/Code/Mantid/CMakeLists.txt
+++ b/Code/Mantid/CMakeLists.txt
@@ -133,7 +133,7 @@ if ( ENABLE_CPACK )
set ( CPACK_PACKAGE_VERSION_MAJOR 1 )
set ( CPACK_PACKAGE_VERSION_MINOR 1 )
set ( CPACK_PACKAGE_VERSION_PATCH ${Framework_WC_REVISION} )
- #set ( CPACK_PACKAGING_INSTALL_PREFIX /opt/${CMAKE_PROJECT_NAME} )
+ set ( CPACK_PACKAGING_INSTALL_PREFIX ${CMAKE_INSTALL_PREFIX} )
# RPM information - only used if generating a rpm
#set ( CPACK_RPM_PACKAGE_ARCHITECTURE x86_64 )
diff --git a/Code/Mantid/MantidPlot/FixBundle.cmake.in b/Code/Mantid/MantidPlot/FixBundle.cmake.in
index 95250d803d2..00b6467abfd 100644
--- a/Code/Mantid/MantidPlot/FixBundle.cmake.in
+++ b/Code/Mantid/MantidPlot/FixBundle.cmake.in
@@ -1,6 +1,6 @@
include (BundleUtilities)
-set ( bundle @CMAKE_INSTALL_PREFIX@/MantidPlot.app )
+set ( bundle ${CMAKE_INSTALL_PREFIX}/MantidPlot.app )
file ( GLOB pyqt_libs ${bundle}/Contents/MacOS/PyQt4/*.so )
file ( GLOB_RECURSE qtplugins ${bundle}/plugins/*.dylib )
--
GitLab