diff options
| author | Sergio Ahumada <sergio.ahumada@digia.com> | 2013-07-24 15:09:38 +0200 |
|---|---|---|
| committer | The Qt Project <gerrit-noreply@qt-project.org> | 2013-07-24 15:09:38 +0200 |
| commit | 509ed01c85c926387f6573dd1b5fe6611fa08118 (patch) | |
| tree | cdc2b8a7df4c9778176a1e3341d018971f769daa /mkspecs/features/data/cmake/Qt5BasicConfig.cmake.in | |
| parent | 288e50227dd5af7cdaba7e4b54a61c539021f1e0 (diff) | |
| parent | 084c5b3db794af1ce86b2b17455d9be5e64baebe (diff) | |
Merge "Merge remote-tracking branch 'origin/stable' into dev" into refs/staging/dev
Diffstat (limited to 'mkspecs/features/data/cmake/Qt5BasicConfig.cmake.in')
| -rw-r--r-- | mkspecs/features/data/cmake/Qt5BasicConfig.cmake.in | 17 |
1 files changed, 12 insertions, 5 deletions
diff --git a/mkspecs/features/data/cmake/Qt5BasicConfig.cmake.in b/mkspecs/features/data/cmake/Qt5BasicConfig.cmake.in index 38623349be..bcff3166d3 100644 --- a/mkspecs/features/data/cmake/Qt5BasicConfig.cmake.in +++ b/mkspecs/features/data/cmake/Qt5BasicConfig.cmake.in @@ -119,14 +119,21 @@ if (NOT TARGET Qt5::$${CMAKE_MODULE_NAME}) set(Qt5$${CMAKE_MODULE_NAME}_PRIVATE_INCLUDE_DIRS) !!ENDIF - foreach(_dir ${_Qt5$${CMAKE_MODULE_NAME}_OWN_INCLUDE_DIRS} -!!IF isEmpty(CMAKE_BUILD_IS_FRAMEWORK) - ${Qt5$${CMAKE_MODULE_NAME}_PRIVATE_INCLUDE_DIRS} -!!ENDIF - ) + foreach(_dir ${_Qt5$${CMAKE_MODULE_NAME}_OWN_INCLUDE_DIRS}) _qt5_$${CMAKE_MODULE_NAME}_check_file_exists(${_dir}) endforeach() +!!IF isEmpty(CMAKE_BUILD_IS_FRAMEWORK) + # Only check existence of private includes if the Private component is + # specified. + list(FIND Qt5$${CMAKE_MODULE_NAME}_FIND_COMPONENTS Private _check_private) + if (NOT _check_private STREQUAL -1) + foreach(_dir ${Qt5$${CMAKE_MODULE_NAME}_PRIVATE_INCLUDE_DIRS}) + _qt5_$${CMAKE_MODULE_NAME}_check_file_exists(${_dir}) + endforeach() + endif() +!!ENDIF + set(Qt5$${CMAKE_MODULE_NAME}_INCLUDE_DIRS ${_Qt5$${CMAKE_MODULE_NAME}_OWN_INCLUDE_DIRS}) set(Qt5$${CMAKE_MODULE_NAME}_DEFINITIONS -D$${MODULE_DEFINE}) |