diff options
| author | Oswald Buddenhagen <oswald.buddenhagen@digia.com> | 2012-12-06 16:29:21 +0100 |
|---|---|---|
| committer | The Qt Project <gerrit-noreply@qt-project.org> | 2012-12-07 19:54:44 +0100 |
| commit | 6fb7222707345612984aecd5bdfd75a81770f00a (patch) | |
| tree | caeb8f023fd42bb8d9738c49dc67c020b37d363b /mkspecs | |
| parent | 14382d77c50bc92dc5c02ca3d0d6c73e8df7e1fd (diff) | |
move cmake template files under features/data/
there will be more template data, and it wouldn't be too nice
to spread it all over mkspecs/.
Change-Id: I909c48d26ac34f8c0f66051a65d326366d49c096
Reviewed-by: Joerg Bornemann <joerg.bornemann@digia.com>
Reviewed-by: Stephen Kelly <stephen.kelly@kdab.com>
Diffstat (limited to 'mkspecs')
| -rw-r--r-- | mkspecs/features/create_cmake.prf | 4 | ||||
| -rw-r--r-- | mkspecs/features/data/cmake/Qt5BasicConfig.cmake.in (renamed from mkspecs/cmake/Qt5BasicConfig.cmake.in) | 0 | ||||
| -rw-r--r-- | mkspecs/features/data/cmake/Qt5ConfigVersion.cmake.in (renamed from mkspecs/cmake/Qt5ConfigVersion.cmake.in) | 0 |
3 files changed, 2 insertions, 2 deletions
diff --git a/mkspecs/features/create_cmake.prf b/mkspecs/features/create_cmake.prf index c222ed4e81..29c8cadfff 100644 --- a/mkspecs/features/create_cmake.prf +++ b/mkspecs/features/create_cmake.prf @@ -155,12 +155,12 @@ if (build_all|CONFIG(release, debug|release)):CMAKE_RELEASE_TYPE = release INSTALLS += cmake_qt5_module_files -cmake_config_file.input = $$PWD/../cmake/Qt5BasicConfig.cmake.in +cmake_config_file.input = $$PWD/data/cmake/Qt5BasicConfig.cmake.in cmake_config_file.output = $$DESTDIR/cmake/Qt5$${CMAKE_MODULE_NAME}/Qt5$${CMAKE_MODULE_NAME}Config.cmake CMAKE_PACKAGE_VERSION = $$eval(QT.$${MODULE}.VERSION) -cmake_config_version_file.input = $$PWD/../cmake/Qt5ConfigVersion.cmake.in +cmake_config_version_file.input = $$PWD/data/cmake/Qt5ConfigVersion.cmake.in cmake_config_version_file.output = $$DESTDIR/cmake/Qt5$${CMAKE_MODULE_NAME}/Qt5$${CMAKE_MODULE_NAME}ConfigVersion.cmake !build_pass:QMAKE_SUBSTITUTES += \ diff --git a/mkspecs/cmake/Qt5BasicConfig.cmake.in b/mkspecs/features/data/cmake/Qt5BasicConfig.cmake.in index 36d0495222..36d0495222 100644 --- a/mkspecs/cmake/Qt5BasicConfig.cmake.in +++ b/mkspecs/features/data/cmake/Qt5BasicConfig.cmake.in diff --git a/mkspecs/cmake/Qt5ConfigVersion.cmake.in b/mkspecs/features/data/cmake/Qt5ConfigVersion.cmake.in index e804754912..e804754912 100644 --- a/mkspecs/cmake/Qt5ConfigVersion.cmake.in +++ b/mkspecs/features/data/cmake/Qt5ConfigVersion.cmake.in |