Skip to content

Instantly share code, notes, and snippets.

@mnutt
Last active January 9, 2018 16:59
Show Gist options
  • Star 0 You must be signed in to star a gist
  • Fork 0 You must be signed in to fork a gist
  • Save mnutt/8a0ae505e13ee89d571036d67a56bf9e to your computer and use it in GitHub Desktop.
Save mnutt/8a0ae505e13ee89d571036d67a56bf9e to your computer and use it in GitHub Desktop.
diff --git a/Source/WebKit/PlatformQt.cmake b/Source/WebKit/PlatformQt.cmake
index 909efc00dba..59f8f7eab45 100644
--- a/Source/WebKit/PlatformQt.cmake
+++ b/Source/WebKit/PlatformQt.cmake
@@ -410,11 +410,19 @@ generate_header("${FORWARDING_HEADERS_DIR}/QtWebKit/QtWebKitDepends"
#endif
")
+if (MACOS_BUILD_FRAMEWORKS)
+ set(WebKit_INCLUDE_DESTINATION "${LIB_INSTALL_DIR}/QtWebKit.framework/Versions/5/Headers")
+ set(WebKit_PRIVATE_INCLUDE_DESTINATION "${WebKit_INCLUDE_DESTINATION}/private")
+else ()
+ set(WebKit_INCLUDE_DESTINATION "${KDE_INSTALL_INCLUDEDIR}/QtWebKit")
+ set(WebKit_PRIVATE_INCLUDE_DESTINATION "${WebKit_INCLUDE_DESTINATION}/${PROJECT_VERSION}/QtWebKit/private")
+endif ()
+
install(
FILES
${WebKit_PUBLIC_HEADERS}
DESTINATION
- ${KDE_INSTALL_INCLUDEDIR}/QtWebKit
+ ${WebKit_INCLUDE_DESTINATION}
COMPONENT Data
)
@@ -423,7 +431,7 @@ install(
FILES
${WebKit_PRIVATE_HEADERS}
DESTINATION
- ${KDE_INSTALL_INCLUDEDIR}/QtWebKit/${PROJECT_VERSION}/QtWebKit/private
+ ${WebKit_PRIVATE_INCLUDE_DESTINATION}
COMPONENT Data
)
@@ -707,11 +715,19 @@ generate_header("${FORWARDING_HEADERS_DIR}/QtWebKitWidgets/QtWebKitWidgetsDepend
#endif
")
+if (MACOS_BUILD_FRAMEWORKS)
+ set(WebKitWidgets_INCLUDE_DESTINATION "${LIB_INSTALL_DIR}/QtWebKitWidgets.framework/Headers")
+ set(WebKitWidgets_PRIVATE_INCLUDE_DESTINATION "${WebKitWidgets_INCLUDE_DESTINATION}/private")
+else ()
+ set(WebKitWidgets_INCLUDE_DESTINATION "${KDE_INSTALL_INCLUDEDIR}/QtWebKitWidgets")
+ set(WebKitWidgets_PRIVATE_INCLUDE_DESTINATION "${WebKitWidgets_INCLUDE_DESTINATION}/${PROJECT_VERSION}/QtWebKitWidgets/private")
+endif ()
+
install(
FILES
${WebKitWidgets_PUBLIC_HEADERS}
DESTINATION
- ${KDE_INSTALL_INCLUDEDIR}/QtWebKitWidgets
+ ${WebKitWidgets_INCLUDE_DESTINATION}
COMPONENT Data
)
@@ -720,7 +736,7 @@ install(
FILES
${WebKitWidgets_PRIVATE_HEADERS}
DESTINATION
- ${KDE_INSTALL_INCLUDEDIR}/QtWebKitWidgets/${PROJECT_VERSION}/QtWebKitWidgets/private
+ ${WebKitWidgets_PRIVATE_INCLUDE_DESTINATION}
COMPONENT Data
)
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment