move cmake template files under features/data/
authorOswald Buddenhagen <oswald.buddenhagen@digia.com>
Thu, 6 Dec 2012 15:29:21 +0000 (16:29 +0100)
committerThe Qt Project <gerrit-noreply@qt-project.org>
Fri, 7 Dec 2012 18:54:44 +0000 (19:54 +0100)
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>
mkspecs/features/create_cmake.prf
mkspecs/features/data/cmake/Qt5BasicConfig.cmake.in [moved from mkspecs/cmake/Qt5BasicConfig.cmake.in with 100% similarity]
mkspecs/features/data/cmake/Qt5ConfigVersion.cmake.in [moved from mkspecs/cmake/Qt5ConfigVersion.cmake.in with 100% similarity]

index c222ed4..29c8cad 100644 (file)
@@ -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 += \