diff options
| author | Vitaly Fanaskov <vitaly.fanaskov@qt.io> | 2019-09-02 09:54:39 +0200 |
|---|---|---|
| committer | Vitaly Fanaskov <vitaly.fanaskov@qt.io> | 2019-09-02 09:58:06 +0000 |
| commit | ba43a4bb98d7dfadff3bbfef49ea7b63f92013fe (patch) | |
| tree | 9e88f0bb9f298edbebf17f6a53063d4d2977c2b7 | |
| parent | fe06cefbb9b5eb13d9fa018e55f7956d0ed925ff (diff) | |
Use correct macOS version to configure KUserFeedback
Also:
1) Extract KUserFeedback components switchers to the separate variable
2) Extract KUserFeedback defines to the separate variable
Fixes: QTCREATORBUG-22861
Change-Id: Ibddc755cbc0d73805c321f5cbdd444f0eeffb887
Reviewed-by: Eike Ziller <eike.ziller@qt.io>
| -rw-r--r-- | usagestatistic.pro | 28 |
1 files changed, 18 insertions, 10 deletions
diff --git a/usagestatistic.pro b/usagestatistic.pro index 0c22626..33d3596 100644 --- a/usagestatistic.pro +++ b/usagestatistic.pro @@ -108,18 +108,26 @@ QTC_PLUGIN_RECOMMENDS += \ BUILD_TYPE = Debug CONFIG(release, debug|release): BUILD_TYPE = Release + KUSERFEEDBACK_DEFINES = \ + -DCMAKE_BUILD_TYPE=$${BUILD_TYPE} + + macos: KUSERFEEDBACK_DEFINES *= -DCMAKE_OSX_DEPLOYMENT_TARGET=$${QMAKE_MACOSX_DEPLOYMENT_TARGET} + + KUSERFEEDBACK_COMPONENTS = \ + -DBUILD_SHARED_LIBS=OFF \ + -DENABLE_SURVEY_TARGET_EXPRESSIONS=OFF \ + -DENABLE_PHP=OFF \ + -DENABLE_PHP_UNIT=OFF \ + -DENABLE_TESTING=OFF \ + -DENABLE_DOCS=OFF \ + -DENABLE_CONSOLE=OFF \ + -DENABLE_CLI=OFF \ + -DBUILD_SHARED_LIBS=OFF + system("cmake -S $$shell_path($${KUSERFEEDBACK_SOURCE_PATH}) \ -B $$shell_path($${KUSERFEEDBACK_BUILD_PATH}) \ - -DBUILD_SHARED_LIBS=OFF \ - -DENABLE_SURVEY_TARGET_EXPRESSIONS=OFF \ - -DENABLE_PHP=OFF \ - -DENABLE_PHP_UNIT=OFF \ - -DENABLE_TESTING=OFF \ - -DENABLE_DOCS=OFF \ - -DENABLE_CONSOLE=OFF \ - -DENABLE_CLI=OFF \ - -DBUILD_SHARED_LIBS=OFF \ - -DCMAKE_BUILD_TYPE=$${BUILD_TYPE} \ + $${KUSERFEEDBACK_COMPONENTS} \ + $${KUSERFEEDBACK_DEFINES} \ -DCMAKE_INSTALL_PREFIX:PATH=\"$$shell_path($${KUSERFEEDBACK_INSTALL_PATH})\" \ -DCMAKE_PREFIX_PATH=\"$${CMAKE_PREFIX_PATHS}\" \ -DKDE_INSTALL_LIBDIR=lib") |