diff options
| author | Eike Ziller <eike.ziller@qt.io> | 2019-09-17 14:19:47 +0200 |
|---|---|---|
| committer | Eike Ziller <eike.ziller@qt.io> | 2019-09-17 13:03:53 +0000 |
| commit | 33f5b39d1cc5a910f0b8f2ec08b9f6695e3fa9b9 (patch) | |
| tree | 76c70d42c3db33bcbc506d5b066be0b331e23fde | |
| parent | ab8aaaec2b45a4cf0bfae2e249c2aabbe15f2bf8 (diff) | |
Output cmake commands when running qmake
Change-Id: I775c67c3427be9fe6ad96b5f8649877963a96555
Reviewed-by: Vitaly Fanaskov <vitaly.fanaskov@qt.io>
Reviewed-by: Eike Ziller <eike.ziller@qt.io>
| -rw-r--r-- | usagestatistic.pro | 15 |
1 files changed, 11 insertions, 4 deletions
diff --git a/usagestatistic.pro b/usagestatistic.pro index 3a80d9e..8ee4897 100644 --- a/usagestatistic.pro +++ b/usagestatistic.pro @@ -99,12 +99,16 @@ QTC_PLUGIN_RECOMMENDS += \ # Create build directory, in case if CMake won't be able do that system("$$sprintf($$QMAKE_MKDIR_CMD, $$shell_path($${EXTRA_CMAKE_MODULES_BUILD_PATH}))") - system("cmake -S $$shell_path($${EXTRA_CMAKE_MODULES_SOURCE_PATH}) \ + EXTRA_CMAKE_MODULES_CMAKE_CMD = \ + "cmake -S $$shell_path($${EXTRA_CMAKE_MODULES_SOURCE_PATH}) \ -B $$shell_path($${EXTRA_CMAKE_MODULES_BUILD_PATH}) \ - -DCMAKE_INSTALL_PREFIX:PATH=\"$$shell_path($${EXTRA_CMAKE_MODULES_INSTALL_PATH})\"") + -DCMAKE_INSTALL_PREFIX:PATH=\"$$shell_path($${EXTRA_CMAKE_MODULES_INSTALL_PATH})\"" + message("$${EXTRA_CMAKE_MODULES_CMAKE_CMD}") + system("$${EXTRA_CMAKE_MODULES_CMAKE_CMD}") # "Build" extra-cmake-modules first time. This step is required to configure KUserFeedback EXTRA_CMAKE_MODULES_BUILD_CMD = "cmake --build $$shell_path($${EXTRA_CMAKE_MODULES_BUILD_PATH}) --target install" + message("$${EXTRA_CMAKE_MODULES_BUILD_CMD}") system("$${EXTRA_CMAKE_MODULES_BUILD_CMD}") # Configure KUserFeedback @@ -135,13 +139,16 @@ QTC_PLUGIN_RECOMMENDS += \ # Create build directory, in case if CMake won't be able do that system("$$sprintf($$QMAKE_MKDIR_CMD, $$shell_path($${KUSERFEEDBACK_BUILD_PATH}))") - system("cmake -S $$shell_path($${KUSERFEEDBACK_SOURCE_PATH}) \ + KUSERFEEDBACK_CMAKE_CMD = \ + "cmake -S $$shell_path($${KUSERFEEDBACK_SOURCE_PATH}) \ -B $$shell_path($${KUSERFEEDBACK_BUILD_PATH}) \ $${KUSERFEEDBACK_COMPONENTS} \ $${KUSERFEEDBACK_DEFINES} \ -DCMAKE_INSTALL_PREFIX:PATH=\"$$shell_path($${KUSERFEEDBACK_INSTALL_PATH})\" \ -DCMAKE_PREFIX_PATH=\"$${CMAKE_PREFIX_PATHS}\" \ - -DKDE_INSTALL_LIBDIR=lib") + -DKDE_INSTALL_LIBDIR=lib" + message("$${KUSERFEEDBACK_CMAKE_CMD}") + system("$${KUSERFEEDBACK_CMAKE_CMD}") buildextracmakemodules.commands = "$${EXTRA_CMAKE_MODULES_BUILD_CMD}" |