From 6c8e1040318ec80d60baa20fc94b79c706614f15 Mon Sep 17 00:00:00 2001 From: Peter Lama Date: Sat, 24 Mar 2018 10:24:07 -0700 Subject: [PATCH] Handle webkit being in a non-standard location on macOS --- src/MacAppBundle/CMakeLists.txt | 11 ++++++++++- 1 file changed, 10 insertions(+), 1 deletion(-) diff --git a/src/MacAppBundle/CMakeLists.txt b/src/MacAppBundle/CMakeLists.txt index 36a1c2a130..8be2dcfd9e 100644 --- a/src/MacAppBundle/CMakeLists.txt +++ b/src/MacAppBundle/CMakeLists.txt @@ -9,6 +9,15 @@ else() set(PYTHON_DIR ${PYTHON_DIR}/${PYTHON_DIR_BASENAME}) endif() +set(WEBKIT_FRAMEWORK_DIR "") +if (Qt5WebKitWidgets_FOUND) + #qtwebkitwidgets references qtwebkit with a relative path, + #so we need to add its location to the search paths + get_filename_component(WEBKIT_LIB_DIR ${Qt5WebKitWidgets_DIR} PATH) + get_filename_component(WEBKIT_LIB_DIR ${WEBKIT_LIB_DIR} PATH) + set(WEBKIT_FRAMEWORK_DIR "${WEBKIT_LIB_DIR}/QtWebKit.framework/Versions/5") +endif() + install(CODE "execute_process(COMMAND ${CMAKE_COMMAND} -E copy_directory ${PYTHON_DIR} ${CMAKE_INSTALL_LIBDIR}/${PYTHON_DIR_BASENAME} )") @@ -79,6 +88,6 @@ install(CODE execute_process( COMMAND ${PYTHON_EXECUTABLE} ${CMAKE_SOURCE_DIR}/src/Tools/MakeMacBundleRelocatable.py - ${APP_PATH} ${HOMEBREW_PREFIX}${MACPORTS_PREFIX}/lib ${XCTEST_PATH} + ${APP_PATH} ${HOMEBREW_PREFIX}${MACPORTS_PREFIX}/lib ${XCTEST_PATH} ${WEBKIT_FRAMEWORK_DIR} )" )