INCLUDE(setup_finalize)
INCLUDE(setup_write_config)
+#
+# CPack configuration
+#
+INCLUDE(setup_cpack)
########################################################################
# #
ADD_SUBDIRECTORY(tests)
ENDIF()
-ADD_SUBDIRECTORY(cpack)
-
#
# And finally, print the configuration:
#
<key>CFBundleDevelopmentRegion</key>
<string>English</string>
<key>CFBundleExecutable</key>
- <string>deal.II</string>
+ <string>@DEAL_II_PACKAGE_NAME@</string>
<key>CFBundleGetInfoString</key>
- <string>8.2.pre</string>
+ <string>@DEAL_II_PACKAGE_VERSION@</string>
<key>CFBundleIconFile</key>
<string>deal.II</string>
<key>CFBundleIdentifier</key>
<key>CFBundlePackageType</key>
<string>APPL</string>
<key>CFBundleShortVersionString</key>
- <string>8.2.pre</string>
+ <string>@DEAL_II_PACKAGE_VERSION@</string>
<key>CFBundleSignature</key>
- <string>deal.II</string>
+ <string>@DEAL_II_PACKAGE_NAME@</string>
<key>CFBundleVersion</key>
- <string>8.2.pre</string>
+ <string>@DEAL_II_PACKAGE_VERSION@</string>
<key>NSHumanReadableCopyright</key>
<string>GPL</string>
<key>LSMinimumSystemVersion</key>
#!/bin/bash
+## ---------------------------------------------------------------------
+##
+## Copyright (C) 2014 by the deal.II authors
+##
+## This file is part of the deal.II library. It is a modified version
+## of the file FEniCS terminal from the FEniCS project.
+##
+## This library is free software; you can redistribute it and/or
+## modify it under the terms of the GNU Lesser General Public
+## License as published by the Free Software Foundation; either
+## version 2.1 of the License, or (at your option) any later version.
+##
+## ---------------------------------------------------------------------
if [ "$BASH_SOURCE" == "$0" ]
then
# Everything seems to be okay. Launch a terminal with PATH's
# set up to work with deal.II.
-CONF=$DEAL_II_RESOURCES/etc/dealii.conf
+CONF=$DEAL_II_RESOURCES/@DEAL_II_COMMON_RELDIR@/dealii.conf
if ! [[ -f $CONF ]]; then
return=`/usr/bin/osascript <<EOF
+## ---------------------------------------------------------------------
+##
+## Copyright (C) 2014 by the deal.II authors
+##
+## This file is part of the deal.II library. It is a modified version
+## of the file FEniCS terminal from the FEniCS project.
+##
+## This library is free software; you can redistribute it and/or
+## modify it under the terms of the GNU Lesser General Public
+## License as published by the Free Software Foundation; either
+## version 2.1 of the License, or (at your option) any later version.
+##
+## ---------------------------------------------------------------------
+
# Make sure DEAL_II_BUNDLE is set correctly
if [ -z "$DEAL_II_BUNDLE" ]; then
export DEAL_II_BUNDLE=/Applications/deal.II.app
these lines to your ~/.profile file (the first line turns off this message):
export DEAL_II_CONF_SILENT=ON
- . $DEAL_II_RESOURCES/etc/dealii.conf
+ . $DEAL_II_RESOURCES/@DEAL_II_COMMON_RELDIR@/dealii.conf
EOF
fi
--- /dev/null
+#!/bin/sh
+## ---------------------------------------------------------------------
+##
+## Copyright (C) 2014 by the deal.II authors
+##
+## This file is part of the deal.II library. It is a modified version
+## of the file FEniCS terminal from the FEniCS project.
+##
+## This library is free software; you can redistribute it and/or
+## modify it under the terms of the GNU Lesser General Public
+## License as published by the Free Software Foundation; either
+## version 2.1 of the License, or (at your option) any later version.
+##
+## ---------------------------------------------------------------------
+
+
+if [ "$BASH_SOURCE" == "$0" ]
+then
+ export DEAL_II_BUNDLE=`echo "$0" | sed -e 's|/Contents/MacOS/.*||'`
+ export DEAL_II_RESOURCES=$DEAL_II_BUNDLE/Contents/Resources
+ open -a /Applications/Utilities/Terminal.app $DEAL_II_RESOURCES/@DEAL_II_EXECUTABLE_RELDIR@/dealii-terminal
+else
+ export DEAL_II_BUNDLE=`echo "$BASH_SOURCE" | sed -e 's|/Contents/MacOS/.*||'`
+ export DEAL_II_RESOURCES=$DEAL_II_BUNDLE/Contents/Resources
+ source $DEAL_II_RESOURCES/@DEAL_II_COMMON_RELDIR@/dealii.conf
+fi
UNSET(${_var} CACHE)
ENDIF()
ENDFOREACH()
+
+# CPack miscellaneous options
+SET(DEAL_II_EXTERNAL_LIBS_TREE "" CACHE PATH
+ "Path to tree of external libraries that will be installed in bundle package."
+ )
+MARK_AS_ADVANCED(DEAL_II_EXTERNAL_LIBS_TREE)
+
+
--- /dev/null
+## ---------------------------------------------------------------------
+##
+## Copyright (C) 2012 - 2014 by the deal.II authors
+##
+## This file is part of the deal.II library.
+##
+## The deal.II library is free software; you can use it, redistribute
+## it, and/or modify it under the terms of the GNU Lesser General
+## Public License as published by the Free Software Foundation; either
+## version 2.1 of the License, or (at your option) any later version.
+## The full text of the license can be found in the file LICENSE at
+## the top level of the deal.II distribution.
+##
+## ---------------------------------------------------------------------
+
+IF(DEAL_II_COMPONENT_PACKAGE)
+ MESSAGE(STATUS "Setting up CPack")
+ SET(CPACK_GENERATOR "Bundle")
+
+ CONFIGURE_FILE(
+ ${CMAKE_SOURCE_DIR}/cmake/cpack-mac-bundle/mac_startup_script.sh.in
+ ${CMAKE_BINARY_DIR}/cpack/mac_startup_script.sh
+ @ONLY
+ )
+
+ CONFIGURE_FILE(
+ ${CMAKE_SOURCE_DIR}/cmake/cpack-mac-bundle/dealii-terminal.in
+ ${CMAKE_BINARY_DIR}/cpack/dealii-terminal
+ @ONLY
+ )
+
+ CONFIGURE_FILE(
+ ${CMAKE_SOURCE_DIR}/cmake/cpack-mac-bundle/dealii.conf.in
+ ${CMAKE_BINARY_DIR}/cpack/dealii.conf
+ @ONLY
+ )
+
+ CONFIGURE_FILE(
+ ${CMAKE_SOURCE_DIR}/cmake/cpack-mac-bundle/Info.plist.in
+ ${CMAKE_BINARY_DIR}/cpack/Info.plist
+ @ONLY
+ )
+
+ SET(CPACK_PACKAGE_ICON
+ "${CMAKE_SOURCE_DIR}/cmake/cpack-mac-bundle/dealii-icon.icns"
+ )
+
+ set(CPACK_PACKAGE_FILE_NAME
+ "${DEAL_II_PACKAGE_NAME}-${DEAL_II_PACKAGE_VERSION}"
+ )
+
+ set(CPACK_BUNDLE_NAME
+ "${DEAL_II_PACKAGE_NAME}"
+ )
+
+ SET(CPACK_BUNDLE_ICON
+ "${CMAKE_SOURCE_DIR}/cmake/cpack-mac-bundle/dealii-icon.icns"
+ )
+
+ SET(CPACK_BUNDLE_PLIST
+ "${CMAKE_BINARY_DIR}/cpack/Info.plist"
+ )
+
+ SET(CPACK_BUNDLE_STARTUP_COMMAND
+ "${CMAKE_BINARY_DIR}/cpack/mac_startup_script.sh"
+ )
+
+ INSTALL(FILES
+ ${CMAKE_BINARY_DIR}/cpack/dealii.conf
+ DESTINATION ${DEAL_II_COMMON_RELDIR}
+ )
+
+ INSTALL(PROGRAMS
+ ${CMAKE_BINARY_DIR}/cpack/dealii-terminal
+ DESTINATION ${DEAL_II_EXECUTABLE_RELDIR}
+ )
+
+ IF(NOT "${DEAL_II_CPACK_EXTERNAL_LIBS_TREE}" STREQUAL "")
+ INSTALL(DIRECTORY ${DEAL_II_EXTERNAL_LIBS_TREE}/
+ DESTINATION opt
+ USE_SOURCE_PERMISSIONS)
+ ENDIF()
+
+ INCLUDE(CPack)
+ MESSAGE(STATUS "Setting up CPack - Done")
+ENDIF()
+++ /dev/null
-## ---------------------------------------------------------------------
-##
-## Copyright (C) 2012 - 2014 by the deal.II authors
-##
-## This file is part of the deal.II library.
-##
-## The deal.II library is free software; you can use it, redistribute
-## it, and/or modify it under the terms of the GNU Lesser General
-## Public License as published by the Free Software Foundation; either
-## version 2.1 of the License, or (at your option) any later version.
-## The full text of the license can be found in the file LICENSE at
-## the top level of the deal.II distribution.
-##
-## ---------------------------------------------------------------------
-
-IF(DEAL_II_COMPONENT_PACKAGE)
- MESSAGE(STATUS "Setting up CPack")
- SET(CPACK_GENERATOR "Bundle")
-
- SET(CPACK_PACKAGE_ICON "${CMAKE_SOURCE_DIR}/cpack/mac-bundle/dealii-icon.icns")
- set(CPACK_PACKAGE_FILE_NAME "${DEAL_II_PACKAGE_NAME}-${DEAL_II_PACKAGE_VERSION}")
- set(CPACK_BUNDLE_NAME "${DEAL_II_PACKAGE_NAME}")
- SET(CPACK_BUNDLE_ICON "${CMAKE_SOURCE_DIR}/cpack/mac-bundle/dealii-icon.icns")
- SET(CPACK_BUNDLE_PLIST "${CMAKE_SOURCE_DIR}/cpack/mac-bundle/Info.plist")
- SET(CPACK_BUNDLE_STARTUP_COMMAND "${CMAKE_SOURCE_DIR}/cpack/mac-bundle/mac_startup_script.sh")
-
- INSTALL(FILES ${CMAKE_SOURCE_DIR}/cpack/mac-bundle/dealii.conf DESTINATION etc/)
- INSTALL(FILES ${CMAKE_SOURCE_DIR}/cpack/mac-bundle/dealii.location DESTINATION etc/)
- INSTALL(PROGRAMS ${CMAKE_SOURCE_DIR}/cpack/mac-bundle/dealii-terminal DESTINATION bin/)
-
- OPTION(DEAL_II_INSTALLS_EXTERNAL_LIBS
- "Install external libraries together with deal.II."
- OFF
- )
-
- IF(DEAL_II_INSTALLS_EXTERNAL_LIBS)
- SET(DEAL_II_EXTERNAL_LIBS_TREE "NOT_SET" CACHE PATH
- "Path to tree of external libraries that will be installed in bundle package."
- )
- INSTALL(DIRECTORY ${DEAL_II_EXTERNAL_LIBS_TREE}/
- DESTINATION opt
- USE_SOURCE_PERMISSIONS)
- ENDIF()
-
- INCLUDE(CPack)
- MESSAGE(STATUS "Setting up CPack - Done")
-ENDIF()
+++ /dev/null
-/Applications/deal.II.app
+++ /dev/null
-#!/bin/sh
-
-function relocate_if_necessary {
- # If necessary, we relocate the libraries and binaries to the new place,
- # by calling install_name_tool on each library in the installation tree
- OLD=`cat $1/Contents/Resources/etc/dealii.location`
- if [ ! "$OLD"=="$1" ];then
- echo $1 > $1/Contents/Resources/etc/dealii.location
- echo Needs relocation from $OLD to $1!
- fi
- return
-}
-
-if [ "$BASH_SOURCE" == "$0" ]
-then
- export DEAL_II_BUNDLE=`echo "$0" | sed -e 's|/Contents/MacOS/.*||'`
- export DEAL_II_RESOURCES=$DEAL_II_BUNDLE/Contents/Resources
- open -a /Applications/Utilities/Terminal.app $DEAL_II_RESOURCES/bin/dealii-terminal
-else
- export DEAL_II_BUNDLE=`echo "$BASH_SOURCE" | sed -e 's|/Contents/MacOS/.*||'`
- export DEAL_II_RESOURCES=$DEAL_II_BUNDLE/Contents/Resources
- source $DEAL_II_RESOURCES/etc/dealii.conf
-fi
projects / dealii.git / commitdiff