diff options
| author | Eike Ziller <eike.ziller@qt.io> | 2019-09-17 14:44:33 +0200 |
|---|---|---|
| committer | Eike Ziller <eike.ziller@qt.io> | 2019-09-17 13:03:59 +0000 |
| commit | c6d48f610245f6c40d219fa2dd2107b28383580a (patch) | |
| tree | e22f340fa8c21759d540ca7abb327a1f06599a0f | |
| parent | 33f5b39d1cc5a910f0b8f2ec08b9f6695e3fa9b9 (diff) | |
Fix build with cmake < 3.13
These unfortunately don't have the -S and -B options yet
Change-Id: I92487956551eab4dc3b817cf6d6709a36186acce
Reviewed-by: Vitaly Fanaskov <vitaly.fanaskov@qt.io>
Reviewed-by: Eike Ziller <eike.ziller@qt.io>
| -rw-r--r-- | usagestatistic.pro | 22 |
1 files changed, 11 insertions, 11 deletions
diff --git a/usagestatistic.pro b/usagestatistic.pro index 8ee4897..f393ea1 100644 --- a/usagestatistic.pro +++ b/usagestatistic.pro @@ -100,14 +100,14 @@ QTC_PLUGIN_RECOMMENDS += \ system("$$sprintf($$QMAKE_MKDIR_CMD, $$shell_path($${EXTRA_CMAKE_MODULES_BUILD_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})\"" + "$$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}") @@ -140,19 +140,19 @@ QTC_PLUGIN_RECOMMENDS += \ system("$$sprintf($$QMAKE_MKDIR_CMD, $$shell_path($${KUSERFEEDBACK_BUILD_PATH}))") KUSERFEEDBACK_CMAKE_CMD = \ - "cmake -S $$shell_path($${KUSERFEEDBACK_SOURCE_PATH}) \ - -B $$shell_path($${KUSERFEEDBACK_BUILD_PATH}) \ - $${KUSERFEEDBACK_COMPONENTS} \ + "$$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 |