From b20c0b66d19e6c85f1e781130cccf87ac27df168 Mon Sep 17 00:00:00 2001 From: Andreas Schenk <andreas_schenk@hms.harvard.edu> Date: Mon, 16 Mar 2015 10:18:14 -0400 Subject: [PATCH] added missing Info.plist for OSX package added libexec dir to OSX deployment cmake script fixed path to python library for OSX packaging --- cmake_support/CopyDependencies.cmake | 1 + deployment/macos/CMakeLists.txt | 1 + deployment/macos/Info.plist | 35 ++++++++++++++++++++++++++++ 3 files changed, 37 insertions(+) create mode 100644 deployment/macos/Info.plist diff --git a/cmake_support/CopyDependencies.cmake b/cmake_support/CopyDependencies.cmake index d3f626b36..f742bc84b 100644 --- a/cmake_support/CopyDependencies.cmake +++ b/cmake_support/CopyDependencies.cmake @@ -655,6 +655,7 @@ function(copy_python include_path version new_binary_path) get_filename_component(real_python_include_path ${include_path} REALPATH) get_filename_component(python_root_dir ${real_python_include_path}/../.. REALPATH) + file(COPY ${python_root_dir}/Resources/Python.app/Contents/MacOS/Python DESTINATION ${CMAKE_INSTALL_PREFIX}) file(COPY ${python_root_dir}/${LIB_DIR}/python${version}/ DESTINATION ${CMAKE_INSTALL_PREFIX}/${LIB_DIR}/python${version}) file(GLOB py_config_files "${include_path}/pyconfig*.h") file(COPY ${py_config_files} DESTINATION ${CMAKE_INSTALL_PREFIX}/include/python${version}) diff --git a/deployment/macos/CMakeLists.txt b/deployment/macos/CMakeLists.txt index 0183d8ec8..e2e9bc675 100644 --- a/deployment/macos/CMakeLists.txt +++ b/deployment/macos/CMakeLists.txt @@ -15,6 +15,7 @@ set(CPACK_PACKAGE_INSTALL_DIRECTORY "openstructure ${OST_VERSION_STRING}" ) install(CODE " if(NOT ${CMAKE_INSTALL_PREFIX} STREQUAL \${CMAKE_INSTALL_PREFIX}) set(LIB_DIR ${LIB_DIR}) #pass libdir variable in install code block + set(LIBEXEC_PATH ${LIBEXEC_PATH})#pass libexec_path variable in install code block set(CMAKE_MODULE_PATH ${CMAKE_MODULE_PATH} ${PROJECT_SOURCE_DIR}/cmake_support) include(CopyDependencies) diff --git a/deployment/macos/Info.plist b/deployment/macos/Info.plist new file mode 100644 index 000000000..5169acff8 --- /dev/null +++ b/deployment/macos/Info.plist @@ -0,0 +1,35 @@ +<?xml version="1.0" encoding="UTF-8"?> +<!DOCTYPE plist PUBLIC "-//Apple Computer//DTD PLIST 1.0//EN" + "http://www.apple.com/DTDs/PropertyList-1.0.dtd"> +<plist version="1.0"> +<dict> + <key>CFBundleDevelopmentRegion</key> + <string>English</string> + <key>CFBundleExecutable</key> + <string>dng</string> + <key>CFBundleName</key> + <string>DNG</string> + <key>CFBundleDisplayName</key> + <string>DNG</string> + <key>CFBundleHelpBookFolder</key> + <string>OpenStructure Manual</string> + <key>CFBundleHelpBookName</key> + <string>OpenStructure Help</string> + <key>CFBundleIconFile</key> + <string>DNG.icns</string> + <key>CFBundleIdentifier</key> + <string>org.openstructure.OpenStructure</string> + <key>CFBundleInfoDictionaryVersion</key> + <string>6.0</string> + <key>CFBundlePackageType</key> + <string>APPL</string> + <key>CFBundleSignature</key> + <string>????</string> + <key>CFBundleVersion</key> + <string></string> + <key>NSMainNibFile</key> + <string>MainMenu</string> + <key>NSPrincipalClass</key> + <string>NSApplication</string> +</dict> +</plist> -- GitLab