diff options
| author | Stephen Kelly <stephen.kelly@kdab.com> | 2013-03-26 20:51:12 +0100 |
|---|---|---|
| committer | The Qt Project <gerrit-noreply@qt-project.org> | 2013-03-27 13:34:58 +0100 |
| commit | 7b6a627315f012598dca23d3ff978a09bfba7969 (patch) | |
| tree | 5a9193a0a9e22325cb2a196d092ae12310b534ae | |
| parent | c216d3ced546dd160005912c90694a07b4626942 (diff) | |
| download | qttools-7b6a627315f012598dca23d3ff978a09bfba7969.tar.gz | |
Generate the Qt5LinguistConfig.cmake files independent of QtUiTools.
The generation relied on the uitools module for the version, so
if it was not available, we got errors like this:
WARNING: Cannot open substitute for output '/cmake/Qt5LinguistTools/Qt5LinguistToolsConfig.cmake'
WARNING: Cannot open substitute for output '/cmake/Qt5LinguistTools/Qt5LinguistToolsConfigVersion.cmake'
WARNING: Cannot open substitute for output '/cmake/Qt5LinguistTools/Qt5LinguistToolsMacros.cmake'
http://testresults.qt-project.org/ci/QtTools_stable_Integration/build_00128/linux-g++_no-widgets_Ubuntu_12.04_x64/log.txt.gz
Use MODULE_VERSION for the version instead and MODULE_BASE_OUTDIR for the
generation location.
Change-Id: I9daa6878553015e841b6e41fd1f64eb60ada7774
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@digia.com>
Reviewed-by: Stephen Kelly <stephen.kelly@kdab.com>
| -rw-r--r-- | src/linguist/linguist.pro | 12 | ||||
| -rw-r--r-- | tests/auto/cmake/CMakeLists.txt | 3 | ||||
| -rw-r--r-- | tests/auto/cmake/cmake.pro | 4 |
3 files changed, 9 insertions, 10 deletions
diff --git a/src/linguist/linguist.pro b/src/linguist/linguist.pro index 334aa1ad8..7e48fa990 100644 --- a/src/linguist/linguist.pro +++ b/src/linguist/linguist.pro @@ -26,15 +26,15 @@ contains(CMAKE_BIN_DIR, "$${CMAKE_QT_INSTALL_PREFIX_ESCAPED}.*") { CMAKE_BIN_DIR_IS_ABSOLUTE = True } +load(qt_build_paths) + cmake_linguist_config_file.input = $$PWD/Qt5LinguistToolsConfig.cmake.in cmake_linguist_config_version_file.input = $$[QT_HOST_DATA]/mkspecs/features/data/cmake/Qt5ConfigVersion.cmake.in cmake_linguist_macros_file.input = $$PWD/Qt5LinguistToolsMacros.cmake -# NOTE: We need to put the linguist tools cmake files in the lib directory. The lib directory -# as set by the uitools module is used for that, as linguist doesn't set such a variable. -CMAKE_PACKAGE_VERSION = $$eval(QT.uitools.VERSION) -cmake_linguist_config_file.output = $$eval(QT.uitools.libs)/cmake/Qt5LinguistTools/Qt5LinguistToolsConfig.cmake -cmake_linguist_config_version_file.output = $$eval(QT.uitools.libs)/cmake/Qt5LinguistTools/Qt5LinguistToolsConfigVersion.cmake -cmake_linguist_macros_file.output = $$eval(QT.uitools.libs)/cmake/Qt5LinguistTools/Qt5LinguistToolsMacros.cmake +CMAKE_PACKAGE_VERSION = $$MODULE_VERSION +cmake_linguist_config_file.output = $$MODULE_BASE_OUTDIR/lib/cmake/Qt5LinguistTools/Qt5LinguistToolsConfig.cmake +cmake_linguist_config_version_file.output = $$MODULE_BASE_OUTDIR/lib/cmake/Qt5LinguistTools/Qt5LinguistToolsConfigVersion.cmake +cmake_linguist_macros_file.output = $$MODULE_BASE_OUTDIR/lib/cmake/Qt5LinguistTools/Qt5LinguistToolsMacros.cmake cmake_linguist_macros_file.CONFIG = verbatim QMAKE_SUBSTITUTES += cmake_linguist_config_file cmake_linguist_config_version_file cmake_linguist_macros_file diff --git a/tests/auto/cmake/CMakeLists.txt b/tests/auto/cmake/CMakeLists.txt index e55749230..499418680 100644 --- a/tests/auto/cmake/CMakeLists.txt +++ b/tests/auto/cmake/CMakeLists.txt @@ -33,8 +33,7 @@ if(NOT CMAKE_CROSSCOMPILING) expect_pass(test_translation_macros) endif() -find_package(Qt5Widgets) -if (Qt5Widgets_FOUND) +if (NOT NO_WIDGETS) test_module_includes( Designer QFormBuilder Help QHelpSearchQuery diff --git a/tests/auto/cmake/cmake.pro b/tests/auto/cmake/cmake.pro index 86aa9c3ca..311af63ff 100644 --- a/tests/auto/cmake/cmake.pro +++ b/tests/auto/cmake/cmake.pro @@ -4,6 +4,6 @@ TEMPLATE = subdirs qtHaveModule(widgets) { CMAKE_QT_MODULES_UNDER_TEST = designer help uitools - - CONFIG += ctest_testcase } + +CONFIG += ctest_testcase |