diff options
| author | Stephen Kelly <steveire@gmail.com> | 2015-04-24 20:33:05 +0200 |
|---|---|---|
| committer | Stephen Kelly <steveire@gmail.com> | 2015-04-27 13:52:53 +0000 |
| commit | 2886935f96e5f817ba3d4b62dbc78bd722123c1f (patch) | |
| tree | a140b5e1245861a486a4896bc6f74d7e1cef9d64 /mkspecs | |
| parent | d1e4ba06928f93026627d21eff61d95b6b0f49c0 (diff) | |
cmake: Don't mark header-only frameworks with the FRAMEWORK property.
CMake INTERFACE targets may only have whitelisted properties, and
FRAMEWORK is not in the whitelist in released CMake versions.
Change-Id: I27cd0cfbe1b52f25c91bf1b3c0d55879bed91bdf
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@theqtcompany.com>
Reviewed-by: Stephen Kelly <steveire@gmail.com>
Diffstat (limited to 'mkspecs')
| -rw-r--r-- | mkspecs/features/data/cmake/Qt5BasicConfig.cmake.in | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/mkspecs/features/data/cmake/Qt5BasicConfig.cmake.in b/mkspecs/features/data/cmake/Qt5BasicConfig.cmake.in index 0befa803a5..d2358cae4b 100644 --- a/mkspecs/features/data/cmake/Qt5BasicConfig.cmake.in +++ b/mkspecs/features/data/cmake/Qt5BasicConfig.cmake.in @@ -232,9 +232,11 @@ if (NOT TARGET Qt5::$${CMAKE_MODULE_NAME}) add_library(Qt5::$${CMAKE_MODULE_NAME} SHARED IMPORTED) !!ENDIF !!ENDIF +!!IF !equals(TEMPLATE, aux) !!IF !isEmpty(CMAKE_BUILD_IS_FRAMEWORK) set_property(TARGET Qt5::$${CMAKE_MODULE_NAME} PROPERTY FRAMEWORK 1) !!ENDIF +!!ENDIF // TEMPLATE != aux set_property(TARGET Qt5::$${CMAKE_MODULE_NAME} PROPERTY INTERFACE_INCLUDE_DIRECTORIES ${_Qt5$${CMAKE_MODULE_NAME}_OWN_INCLUDE_DIRS}) |