Support mac frameworks with ecm output #388
Conversation
This ensures they can be easily included in projects with `QT += webkit`, etc.
|
I believe I have this where it generates correct pkgconfig and pri files for both linux and mac without substantially changing the ecm api. The only minor difference is that linux's pri file changes the |
| LIB_NAME QtWebKit | ||
| BASE_NAME ${WEBKIT_BASE_NAME} | ||
| LIB_NAME ${WEBKIT_LIB_NAME} | ||
| INCLUDE_INSTALL_DIR "${KDE_INSTALL_INCLUDEDIR}/QtWebKit" |
There was a problem hiding this comment.
Bug here: INCLUDE_INSTALL_DIR is defined above in WebKit_PRI_ARGUMENTS.
It is crucial that when we install into Qt prefix (KDE_INSTALL_USE_QT_SYS_PATHS condition) qmake variable $$QT_MODULE_INCLUDE_BASE is used instead of prefix path known to CMake. This makes .pri files relocatable, and also allows compatibility with unusual installation layouts of Qt
| LIB_NAME QtWebKitWidgets | ||
| BASE_NAME ${WEBKITWIDGETS_BASE_NAME} | ||
| LIB_NAME ${WEBKITWIDGETS_LIB_NAME} | ||
| INCLUDE_INSTALL_DIR "${KDE_INSTALL_INCLUDEDIR}/QtWebKitWidgets" |
| @@ -185,6 +185,13 @@ function(ECM_GENERATE_PRI_FILE) | |||
| set(PRI_TARGET_CONFIG "staticlib") | |||
| endif () | |||
|
|
|||
| if (${CMAKE_SYSTEM_NAME} MATCHES "Darwin") | |||
There was a problem hiding this comment.
- I think it's OK to use shorter
APPLEinstead of${CMAKE_SYSTEM_NAME} MATCHES "Darwin", at least we do this in lots of places already - In static builds we don't produce frameworks, so you at least should check for
APPLE AND NOT QT_STATIC_BUILD. See also 846a83b - Though it's also possible to create Qt build that uses shared libraries, but does not create frameworks. We don't support this configuration yet, but it would be nice to have
| if (EGPF_FILENAME_VAR) | ||
| set(${EGPF_FILENAME_VAR} ${PKGCONFIG_FILENAME} PARENT_SCOPE) | ||
| endif() | ||
|
|
||
| set(PROJECT_LIBS "-L${CMAKE_INSTALL_PREFIX}/${EGPF_LIB_INSTALL_DIR} -l${PKGCONFIG_TARGET_LIBNAME}") | ||
|
|
||
| if (${CMAKE_SYSTEM_NAME} MATCHES "Darwin") |
| if (${CMAKE_SYSTEM_NAME} MATCHES "Darwin") | ||
| set(PROJECT_LIBS "-F${CMAKE_INSTALL_PREFIX}/${EGPF_LIB_INSTALL_DIR} -framework ${PKGCONFIG_TARGET_LIBNAME}") | ||
| set(PKGCONFIG_TARGET_INCLUDES "-I${CMAKE_INSTALL_PREFIX}/${EGPF_LIB_INSTALL_DIR}/${PKGCONFIG_TARGET_LIBNAME}.framework/includes") | ||
| endif () |
|
I've imported latest version of ECMGeneratePkgConfigFile from upstream, it adds DESCRIPTION field. I'll delay fixes for mac frameworks, as at the moment Qt doesn't provide .pc files for framework builds, so QtWebKit's files are not useful. This may change in future, I believe Qt should strive to provide first class pkg-config support on all desktop platforms |
Supercedes #386, this is just squashed and cleaned up.
This allows a mac application to use QtWebKit dropped in via
QT += webkit webkitwidgets. QtWebKit is built as a framework, so this updates the *.pri and *.pc files to pass the correct-framework QtWebKitvalues to clang++.This doesn't change the linux pri files, except to add
QT.webkit.module = Qt5WebKit, which I believe normalizes it with the built-in qt modules.