From 6fb7222707345612984aecd5bdfd75a81770f00a Mon Sep 17 00:00:00 2001 From: Oswald Buddenhagen Date: Thu, 6 Dec 2012 16:29:21 +0100 Subject: [PATCH] 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 Reviewed-by: Stephen Kelly --- mkspecs/features/create_cmake.prf | 4 ++-- mkspecs/{ => features/data}/cmake/Qt5BasicConfig.cmake.in | 0 mkspecs/{ => features/data}/cmake/Qt5ConfigVersion.cmake.in | 0 3 files changed, 2 insertions(+), 2 deletions(-) rename mkspecs/{ => features/data}/cmake/Qt5BasicConfig.cmake.in (100%) rename mkspecs/{ => features/data}/cmake/Qt5ConfigVersion.cmake.in (100%) 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 similarity index 100% rename from mkspecs/cmake/Qt5BasicConfig.cmake.in rename to mkspecs/features/data/cmake/Qt5BasicConfig.cmake.in diff --git a/mkspecs/cmake/Qt5ConfigVersion.cmake.in b/mkspecs/features/data/cmake/Qt5ConfigVersion.cmake.in similarity index 100% rename from mkspecs/cmake/Qt5ConfigVersion.cmake.in rename to mkspecs/features/data/cmake/Qt5ConfigVersion.cmake.in