From: Luca Heltai Date: Fri, 20 May 2016 14:41:52 +0000 (+0200) Subject: Make it possible to generate packages with arbitrary names using cpack. X-Git-Tag: v8.5.0-rc1~1012^2 X-Git-Url: https://gitweb.dealii.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=74dbbf65ec090e6c953629130c9b45c157da1636;p=dealii.git Make it possible to generate packages with arbitrary names using cpack. --- diff --git a/cmake/cpack-mac-bundle/Info.plist.in b/cmake/cpack-mac-bundle/Info.plist.in index d3332c078d..c8ff84150d 100644 --- a/cmake/cpack-mac-bundle/Info.plist.in +++ b/cmake/cpack-mac-bundle/Info.plist.in @@ -5,11 +5,11 @@ CFBundleDevelopmentRegion English CFBundleExecutable - @DEAL_II_PACKAGE_NAME@ + @DEAL_II_CPACK_BUNDLE_NAME@ CFBundleGetInfoString - @DEAL_II_PACKAGE_VERSION@ + @DEAL_II_CPACK_BUNDLE_NAME@-@DEAL_II_PACKAGE_VERSION@ CFBundleIconFile - deal.II + @DEAL_II_CPACK_BUNDLE_NAME@ CFBundleIdentifier org.dealii CFBundleInfoDictionaryVersion @@ -19,12 +19,12 @@ CFBundleShortVersionString @DEAL_II_PACKAGE_VERSION@ CFBundleSignature - @DEAL_II_PACKAGE_NAME@ + @DEAL_II_CPACK_BUNDLE_NAME@-@DEAL_II_PACKAGE_VERSION@ CFBundleVersion @DEAL_II_PACKAGE_VERSION@ NSHumanReadableCopyright GPL LSMinimumSystemVersion - 10.9 + 10.11 diff --git a/cmake/cpack-mac-bundle/dealii-terminal.in b/cmake/cpack-mac-bundle/dealii-terminal.in index 71b887dc41..6b355771ab 100755 --- a/cmake/cpack-mac-bundle/dealii-terminal.in +++ b/cmake/cpack-mac-bundle/dealii-terminal.in @@ -24,7 +24,7 @@ fi # Make sure DEAL_II_BUNDLE is set correctly if [ -z "$DEAL_II_BUNDLE" ]; then - export DEAL_II_BUNDLE=/Applications/deal.II.app + export DEAL_II_BUNDLE=/Applications/@DEAL_II_CPACK_BUNDLE_NAME@.app if [ ! -d $DEAL_II_BUNDLE ]; then return=`/usr/bin/osascript <