diff options
| author | Stephen Kelly <stephen.kelly@kdab.com> | 2013-03-26 10:47:01 +0100 |
|---|---|---|
| committer | The Qt Project <gerrit-noreply@qt-project.org> | 2013-03-26 13:07:14 +0100 |
| commit | ea1b1efbc1e14c9960c46e731f0681ee398343d7 (patch) | |
| tree | cc80d3c8ab7bc49c32415d69cad6c6e8ef58b12f /src/corelib/Qt5CoreConfigExtras.cmake.in | |
| parent | 7fb3c6bf3d51b7c2ef490dedba1c4ea69c4b5f28 (diff) | |
Revert "Don't duplicate the 'top-level' include dir in all modules."
This will likely fix some odd cmake related tests in the CI.
This reverts commit 316d8ececa3314ec16baf46ec4f1c5440cd951ef.
Conflicts:
mkspecs/features/data/cmake/Qt5BasicConfig.cmake.in
src/corelib/Qt5CoreConfigExtras.cmake.in
Change-Id: Ib7714746f96bf12061d92242a42296d200c56c00
Reviewed-by: David Faure (KDE) <faure@kde.org>
Diffstat (limited to 'src/corelib/Qt5CoreConfigExtras.cmake.in')
| -rw-r--r-- | src/corelib/Qt5CoreConfigExtras.cmake.in | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/corelib/Qt5CoreConfigExtras.cmake.in b/src/corelib/Qt5CoreConfigExtras.cmake.in index 29e37be64a..9b6cda11aa 100644 --- a/src/corelib/Qt5CoreConfigExtras.cmake.in +++ b/src/corelib/Qt5CoreConfigExtras.cmake.in @@ -47,9 +47,9 @@ set_property(TARGET Qt5::Core APPEND PROPERTY ) !!IF isEmpty(CMAKE_ARCHDATA_DIR_IS_ABSOLUTE) -list(APPEND Qt5Core_INCLUDE_DIRS \"${_qt5Core_install_prefix}/$$CMAKE_INCLUDE_DIR\" \"${_qt5Core_install_prefix}/$${CMAKE_ARCHDATA_DIR}/mkspecs/$${CMAKE_MKSPEC}\") +list(APPEND Qt5Core_INCLUDE_DIRS \"${_qt5Core_install_prefix}/$${CMAKE_ARCHDATA_DIR}/mkspecs/$${CMAKE_MKSPEC}\") !!ELSE -list(APPEND Qt5Core_INCLUDE_DIRS \"$$CMAKE_INCLUDE_DIR\" \"$${CMAKE_ARCHDATA_DIR}mkspecs/$${CMAKE_MKSPEC}\") +list(APPEND Qt5Core_INCLUDE_DIRS \"$${CMAKE_ARCHDATA_DIR}mkspecs/$${CMAKE_MKSPEC}\") !!ENDIF !!IF !isEmpty(CMAKE_ADD_FPIE_FLAGS) |