diff options
| author | Stephen Kelly <stephen.kelly@kdab.com> | 2013-10-15 23:18:44 +0200 |
|---|---|---|
| committer | The Qt Project <gerrit-noreply@qt-project.org> | 2013-10-16 15:30:13 +0200 |
| commit | 786b278f91aa4d5f1ff8fa10555bf6c8741c96a0 (patch) | |
| tree | 1c18b9eb5040b92cd7fcefcc1a3513c08452a5d9 /mkspecs/features/data | |
| parent | e29b35024e3adf3b58770573cb512395bc5fe176 (diff) | |
Generate source includes in a separate file, if needed.
The source includes shouldn't be used by installations, so
don't install the extra file, but only use it if the package
is used from the build-dir.
Task-number: QTBUG-33970
Change-Id: I08f91b8a716e935cb04d1233d44cf5c092e240ce
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@digia.com>
Reviewed-by: Stephen Kelly <stephen.kelly@kdab.com>
Diffstat (limited to 'mkspecs/features/data')
| -rw-r--r-- | mkspecs/features/data/cmake/ExtraSourceIncludes.cmake.in | 7 | ||||
| -rw-r--r-- | mkspecs/features/data/cmake/Qt5BasicConfig.cmake.in | 7 |
2 files changed, 8 insertions, 6 deletions
diff --git a/mkspecs/features/data/cmake/ExtraSourceIncludes.cmake.in b/mkspecs/features/data/cmake/ExtraSourceIncludes.cmake.in new file mode 100644 index 0000000000..ec8075f3f7 --- /dev/null +++ b/mkspecs/features/data/cmake/ExtraSourceIncludes.cmake.in @@ -0,0 +1,7 @@ + +list(APPEND _Qt5$${CMAKE_MODULE_NAME}_OWN_INCLUDE_DIRS + $$CMAKE_SOURCE_INCLUDES +) +set(Qt5$${CMAKE_MODULE_NAME}_PRIVATE_INCLUDE_DIRS + $$CMAKE_SOURCE_PRIVATE_INCLUDES +) diff --git a/mkspecs/features/data/cmake/Qt5BasicConfig.cmake.in b/mkspecs/features/data/cmake/Qt5BasicConfig.cmake.in index 245c0ae768..0cdaafee7f 100644 --- a/mkspecs/features/data/cmake/Qt5BasicConfig.cmake.in +++ b/mkspecs/features/data/cmake/Qt5BasicConfig.cmake.in @@ -121,12 +121,7 @@ if (NOT TARGET Qt5::$${CMAKE_MODULE_NAME}) !!ENDIF !!ENDIF !!IF !isEmpty(CMAKE_ADD_SOURCE_INCLUDE_DIRS) - list(APPEND _Qt5$${CMAKE_MODULE_NAME}_OWN_INCLUDE_DIRS - $$CMAKE_SOURCE_INCLUDES - ) - set(Qt5$${CMAKE_MODULE_NAME}_PRIVATE_INCLUDE_DIRS - $$CMAKE_SOURCE_PRIVATE_INCLUDES - ) + include(\"${CMAKE_CURRENT_LIST_DIR}/ExtraSourceIncludes.cmake\" OPTIONAL) !!ENDIF !!ELSE set(_Qt5$${CMAKE_MODULE_NAME}_OWN_INCLUDE_DIRS) |