diff options
| author | Kai Koehne <kai.koehne@qt.io> | 2020-05-19 10:31:35 +0200 |
|---|---|---|
| committer | Qt Cherry-pick Bot <cherrypick_bot@qt-project.org> | 2020-05-19 12:03:48 +0000 |
| commit | fb4fbc21c4b5ff6ce1719add142e96d567918940 (patch) | |
| tree | 447b14c1a77d31e03db54862b6971887e7085d32 | |
| parent | 12801a531be233eafbf81ebd579bd03b1363e30a (diff) | |
CMake: Fix name of host tools on Windows
Make sure that qdoc, qtattributionsscanner, get an .exe if built on
Windows.
CMAKE_BIN_PREFIX is usually defined via create_cmake.prf, but
in the case of the two tools this isn't used.
Fixes: QTBUG-84304
Change-Id: I5d8d77b07012187c7939b9eb1afa9ddffac8c918
Reviewed-by: Alexandru Croitor <alexandru.croitor@qt.io>
Reviewed-by: Venugopal Shivashankar <Venugopal.Shivashankar@qt.io>
(cherry picked from commit 1d4942ac20feb3cbbcd80622756fd4e1cf02e3f0)
Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
| -rw-r--r-- | src/qdoc/qdoc.pro | 2 | ||||
| -rw-r--r-- | src/qtattributionsscanner/qtattributionsscanner.pro | 2 |
2 files changed, 4 insertions, 0 deletions
diff --git a/src/qdoc/qdoc.pro b/src/qdoc/qdoc.pro index 11a11b70f..db4b25cf1 100644 --- a/src/qdoc/qdoc.pro +++ b/src/qdoc/qdoc.pro @@ -148,6 +148,8 @@ contains(CMAKE_BIN_DIR, "^\\.\\./.*") { load(qt_build_paths) +equals(QMAKE_HOST.os, Windows): CMAKE_BIN_SUFFIX = ".exe" + cmake_qdoc_config_file.input = $$PWD/Qt5DocToolsConfig.cmake.in cmake_qdoc_config_version_file.input = $$[QT_HOST_DATA/src]/mkspecs/features/data/cmake/Qt5ConfigVersion.cmake.in CMAKE_PACKAGE_VERSION = $$MODULE_VERSION diff --git a/src/qtattributionsscanner/qtattributionsscanner.pro b/src/qtattributionsscanner/qtattributionsscanner.pro index a6f34ee6f..d645a22a9 100644 --- a/src/qtattributionsscanner/qtattributionsscanner.pro +++ b/src/qtattributionsscanner/qtattributionsscanner.pro @@ -48,6 +48,8 @@ contains(CMAKE_BIN_DIR, "^\\.\\./.*") { load(qt_build_paths) +equals(QMAKE_HOST.os, Windows): CMAKE_BIN_SUFFIX = ".exe" + cmake_qattributionsscanner_config_file.input = $$PWD/Qt5AttributionsScannerTools.cmake.in cmake_qattributionsscanner_config_version_file.input = $$[QT_HOST_DATA/src]/mkspecs/features/data/cmake/Qt5ConfigVersion.cmake.in CMAKE_PACKAGE_VERSION = $$MODULE_VERSION |