diff --git a/src/MacAppBundle/CMakeLists.txt b/src/MacAppBundle/CMakeLists.txt index 14d547e33e..eeee288bca 100644 --- a/src/MacAppBundle/CMakeLists.txt +++ b/src/MacAppBundle/CMakeLists.txt @@ -19,7 +19,7 @@ if (Qt5WebKitWidgets_FOUND) endif() install(CODE "execute_process(COMMAND - ${CMAKE_COMMAND} -E copy_directory ${PYTHON_DIR} ${CMAKE_INSTALL_LIBDIR}/${PYTHON_DIR_BASENAME} +${CMAKE_COMMAND} -E copy_directory ${PYTHON_DIR} ${CMAKE_INSTALL_LIBDIR}/${PYTHON_DIR_BASENAME} )") if(HOMEBREW_PREFIX) @@ -31,7 +31,7 @@ if(HOMEBREW_PREFIX) foreach(PTH_FILE ${HOMEBREW_PTH_FILES}) file(READ ${PTH_FILE} ADDITIONAL_DIR) - string(STRIP "${ADDITIONAL_DIR}" ADDITIONAL_DIR) + string(STRIP "${ADDITIONAL_DIR}" ADDITIONAL_DIR) string(FIND "${ADDITIONAL_DIR}" "${HOMEBREW_PREFIX}/Cellar" POSITION) string(LENGTH "${ADDITIONAL_DIR}" DIR_LENGTH) string(SUBSTRING "${ADDITIONAL_DIR}" ${POSITION} ${DIR_LENGTH}-${POSITION} DIR_TAIL) @@ -45,52 +45,52 @@ if(HOMEBREW_PREFIX) get_filename_component(PTH_FILENAME ${PTH_FILE} NAME) install(CODE "file(WRITE - ${CMAKE_INSTALL_LIBDIR}/${PYTHON_DIR_BASENAME}/site-packages/${PTH_FILENAME} - \"../../../${NEW_SITE_DIR}/site-packages\" + ${CMAKE_INSTALL_LIBDIR}/${PYTHON_DIR_BASENAME}/site-packages/${PTH_FILENAME} + \"../../../${NEW_SITE_DIR}/site-packages\" )" - ) + ) endforeach(PTH_FILE) endif() if(BUILD_QT5) - set(QT_PLUGINS_DIR "${Qt5Core_DIR}/../../../plugins") - execute_process(COMMAND "xcode-select" "--print-path" - OUTPUT_VARIABLE XCODE_PATH - ERROR_QUIET - ) - string(STRIP ${XCODE_PATH} XCODE_PATH) + set(QT_PLUGINS_DIR "${Qt5Core_DIR}/../../../plugins") + execute_process(COMMAND "xcode-select" "--print-path" + OUTPUT_VARIABLE XCODE_PATH + ERROR_QUIET + ) + string(STRIP ${XCODE_PATH} XCODE_PATH) - set(XCTEST_PATH "${XCODE_PATH}/Platforms/MacOSX.platform/Developer/Library/Frameworks/XCTest.framework/Versions/Current") + set(XCTEST_PATH "${XCODE_PATH}/Platforms/MacOSX.platform/Developer/Library/Frameworks/XCTest.framework/Versions/Current") - # add qt assistant to bundle - install(PROGRAMS "${Qt5Core_DIR}/../../../libexec/Assistant.app/Contents/MacOS/Assistant" DESTINATION ${CMAKE_INSTALL_PREFIX}/MacOS) + # add qt assistant to bundle + install(PROGRAMS "${Qt5Core_DIR}/../../../libexec/Assistant.app/Contents/MacOS/Assistant" DESTINATION ${CMAKE_INSTALL_PREFIX}/MacOS) endif(BUILD_QT5) - # add QtWebEngineProcess to bundle - if(BUILD_WEB) - install(PROGRAMS "${Qt5Core_DIR}/../../../lib/QtWebEngineCore.framework/Versions/5/Helpers/QtWebEngineProcess.app/Contents/MacOS/QtWebEngineProcess" DESTINATION ${CMAKE_INSTALL_PREFIX}/MacOS) +# add QtWebEngineProcess to bundle +if(BUILD_WEB) + install(PROGRAMS "${Qt5Core_DIR}/../../../lib/QtWebEngineCore.framework/Versions/5/Helpers/QtWebEngineProcess.app/Contents/MacOS/QtWebEngineProcess" DESTINATION ${CMAKE_INSTALL_PREFIX}/MacOS) - # add locales to bundle - file(GLOB _locales_files RELATIVE "${Qt5Core_DIR}/../../../lib/QtWebEngineCore.framework/Versions/5/Resources/qtwebengine_locales" "${Qt5Core_DIR}/../../../lib/QtWebEngineCore.framework/Versions/5/Resources/qtwebengine_locales/*") - foreach(_locales_file ${_locales_files}) + # add locales to bundle + file(GLOB _locales_files RELATIVE "${Qt5Core_DIR}/../../../lib/QtWebEngineCore.framework/Versions/5/Resources/qtwebengine_locales" "${Qt5Core_DIR}/../../../lib/QtWebEngineCore.framework/Versions/5/Resources/qtwebengine_locales/*") + foreach(_locales_file ${_locales_files}) get_filename_component(_resolved_file "${Qt5Core_DIR}/../../../lib/QtWebEngineCore.framework/Versions/5/Resources/qtwebengine_locales/${_locales_file}" REALPATH) list(APPEND _locales_resolved_files ${_resolved_file}) - endforeach() - install(FILES ${_locales_resolved_files} DESTINATION "${CMAKE_INSTALL_PREFIX}/MacOS/qtwebengine_locales") - - # add pak - file(GLOB _pak_files RELATIVE "${Qt5Core_DIR}/../../../lib/QtWebEngineCore.framework/Versions/5/Resources/" "${Qt5Core_DIR}/../../../lib/QtWebEngineCore.framework/Versions/5/Resources/*.pak") - foreach(_pak_file ${_pak_files}) + endforeach() + install(FILES ${_locales_resolved_files} DESTINATION "${CMAKE_INSTALL_PREFIX}/MacOS/qtwebengine_locales") + + # add pak + file(GLOB _pak_files RELATIVE "${Qt5Core_DIR}/../../../lib/QtWebEngineCore.framework/Versions/5/Resources/" "${Qt5Core_DIR}/../../../lib/QtWebEngineCore.framework/Versions/5/Resources/*.pak") + foreach(_pak_file ${_pak_files}) get_filename_component(_pak_resolved_file "${Qt5Core_DIR}/../../../lib/QtWebEngineCore.framework/Versions/5/Resources/${_pak_file}" REALPATH) list(APPEND _pak_resolved_files ${_pak_resolved_file}) - endforeach() - install(FILES ${_pak_resolved_files} DESTINATION "${CMAKE_INSTALL_PREFIX}/") + endforeach() + install(FILES ${_pak_resolved_files} DESTINATION "${CMAKE_INSTALL_PREFIX}/") - # add icudtl.dat - - install(PROGRAMS "${Qt5Core_DIR}/../../../lib/QtWebEngineCore.framework/Versions/5/Resources/icudtl.dat" DESTINATION ${CMAKE_INSTALL_PREFIX}/) - install(PROGRAMS "${Qt5Core_DIR}/../../../lib/QtWebEngineCore.framework/Versions/5/Resources/QtWebEngineCore.prl" DESTINATION ${CMAKE_INSTALL_PREFIX}/) - endif(BUILD_WEB) + # add icudtl.dat + + install(PROGRAMS "${Qt5Core_DIR}/../../../lib/QtWebEngineCore.framework/Versions/5/Resources/icudtl.dat" DESTINATION ${CMAKE_INSTALL_PREFIX}/) + install(PROGRAMS "${Qt5Core_DIR}/../../../lib/QtWebEngineCore.framework/Versions/5/Resources/QtWebEngineCore.prl" DESTINATION ${CMAKE_INSTALL_PREFIX}/) +endif(BUILD_WEB) # Ensure the actual plugin files are installed instead of symlinks. @@ -116,16 +116,16 @@ install(CODE "execute_process(COMMAND chmod -R a+w ${CMAKE_INSTALL_LIBDIR})") get_filename_component(APP_PATH ${CMAKE_INSTALL_PREFIX} PATH) execute_process( - COMMAND find /usr/local/Cellar/icu4c -name pkgconfig - RESULT_VARIABLE CMD_ERROR - OUTPUT_VARIABLE CONFIG_ICU) + COMMAND find /usr/local/Cellar/icu4c -name pkgconfig + RESULT_VARIABLE CMD_ERROR + OUTPUT_VARIABLE CONFIG_ICU) set(ENV{PKG_CONFIG_PATH} "$ENV{PKG_CONFIG_PATH}:${CONFIG_ICU}") find_package(PkgConfig) pkg_check_modules(ICU icu-uc) execute_process( - COMMAND find -L /usr/local/Cellar/nglib -name MacOS - OUTPUT_VARIABLE CONFIG_NGLIB) + COMMAND find -L /usr/local/Cellar/nglib -name MacOS + OUTPUT_VARIABLE CONFIG_NGLIB) install(CODE "message(STATUS \"Making bundle relocatable...\")