diff options
| author | Eike Ziller <eike.ziller@qt.io> | 2019-09-17 15:07:34 +0200 |
|---|---|---|
| committer | Eike Ziller <eike.ziller@qt.io> | 2019-09-17 15:07:34 +0200 |
| commit | 574710d47b9ecd734c446608e361163264b1ed44 (patch) | |
| tree | e22f340fa8c21759d540ca7abb327a1f06599a0f | |
| parent | 465f699801e16478c7064b829f49c893e95c7d0b (diff) | |
| parent | c6d48f610245f6c40d219fa2dd2107b28383580a (diff) | |
Merge remote-tracking branch 'origin/4.10'
Conflicts:
usagestatistic.pro
Change-Id: Ie0b5062b447ddb2ab4073fcd38812897d0ba9988
| -rw-r--r-- | usagestatistic.pro | 29 |
1 files changed, 18 insertions, 11 deletions
diff --git a/usagestatistic.pro b/usagestatistic.pro index 3a80d9e..f393ea1 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}) \ - -B $$shell_path($${EXTRA_CMAKE_MODULES_BUILD_PATH}) \ - -DCMAKE_INSTALL_PREFIX:PATH=\"$$shell_path($${EXTRA_CMAKE_MODULES_INSTALL_PATH})\"") + EXTRA_CMAKE_MODULES_CMAKE_CMD = \ + "$$QMAKE_CD $$system_quote($$shell_path($${EXTRA_CMAKE_MODULES_BUILD_PATH})) && \ + cmake -DCMAKE_INSTALL_PREFIX:PATH=$$system_quote($$shell_path($${EXTRA_CMAKE_MODULES_INSTALL_PATH})) \ + $$system_quote($$shell_path($${EXTRA_CMAKE_MODULES_SOURCE_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" + EXTRA_CMAKE_MODULES_BUILD_CMD = "cmake --build $$system_quote($$shell_path($${EXTRA_CMAKE_MODULES_BUILD_PATH})) --target install" + message("$${EXTRA_CMAKE_MODULES_BUILD_CMD}") system("$${EXTRA_CMAKE_MODULES_BUILD_CMD}") # Configure KUserFeedback @@ -135,17 +139,20 @@ 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}) \ - -B $$shell_path($${KUSERFEEDBACK_BUILD_PATH}) \ - $${KUSERFEEDBACK_COMPONENTS} \ + KUSERFEEDBACK_CMAKE_CMD = \ + "$$QMAKE_CD $$system_quote($$shell_path($${KUSERFEEDBACK_BUILD_PATH})) && \ + cmake $${KUSERFEEDBACK_COMPONENTS} \ $${KUSERFEEDBACK_DEFINES} \ - -DCMAKE_INSTALL_PREFIX:PATH=\"$$shell_path($${KUSERFEEDBACK_INSTALL_PATH})\" \ - -DCMAKE_PREFIX_PATH=\"$${CMAKE_PREFIX_PATHS}\" \ - -DKDE_INSTALL_LIBDIR=lib") + -DCMAKE_INSTALL_PREFIX:PATH=$$system_quote($$shell_path($${KUSERFEEDBACK_INSTALL_PATH})) \ + -DCMAKE_PREFIX_PATH=$$system_quote($${CMAKE_PREFIX_PATHS}) \ + -DKDE_INSTALL_LIBDIR=lib \ + $$system_quote($$shell_path($${KUSERFEEDBACK_SOURCE_PATH}))" + message("$${KUSERFEEDBACK_CMAKE_CMD}") + system("$${KUSERFEEDBACK_CMAKE_CMD}") buildextracmakemodules.commands = "$${EXTRA_CMAKE_MODULES_BUILD_CMD}" - buildkuserfeedback.commands = "cmake --build $$shell_path($${KUSERFEEDBACK_BUILD_PATH}) --target install" + buildkuserfeedback.commands = "cmake --build $$system_quote($$shell_path($${KUSERFEEDBACK_BUILD_PATH})) --target install" buildkuserfeedback.depends = buildextracmakemodules # Force build order. Without this flag Make tries building targets |