diff options
| author | Vitaly Fanaskov <vitaly.fanaskov@qt.io> | 2019-08-26 16:09:23 +0200 |
|---|---|---|
| committer | Vitaly Fanaskov <vitaly.fanaskov@qt.io> | 2019-08-27 08:02:16 +0000 |
| commit | 8c0e072c5a9b40370d458801fe5c9879197dffdb (patch) | |
| tree | 32849630d688b184e37e167d93addf4068e6e661 | |
| parent | 7fac843b497a5cab3c6791e7a6a97111e688f6fd (diff) | |
Fix KUserFeedback lib names on Mac
Also rearrange code a bit to improve readability.
Task-number: QTCREATORBUG-22861
Change-Id: I1333d7238b4efe556f8e5a339988818edafa760e
Reviewed-by: Eike Ziller <eike.ziller@qt.io>
| -rw-r--r-- | usagestatistic.pro | 16 |
1 files changed, 12 insertions, 4 deletions
diff --git a/usagestatistic.pro b/usagestatistic.pro index d0061c9..6327697 100644 --- a/usagestatistic.pro +++ b/usagestatistic.pro @@ -1,11 +1,8 @@ DEFINES += USAGESTATISTIC_LIBRARY -KUSERFEEDBACK_SOURCE_PATH = "$${PWD}/3rdparty/kuserfeedback" -KUSERFEEDBACK_BUILD_PATH = "$${OUT_PWD}/kuserfeedback/build" -KUSERFEEDBACK_INSTALL_PATH = "$${OUT_PWD}/kuserfeedback" +KUSERFEEDBACK_SOURCE_PATH = "$${PWD}/3rdparty/kuserfeedback" INCLUDEPATH *= "$${KUSERFEEDBACK_INSTALL_PATH}/include" "$${PWD}" -LIBS *= -L"$${KUSERFEEDBACK_INSTALL_PATH}/lib" -lKUserFeedbackCore -lKUserFeedbackWidgets -lKUserFeedbackCommon CONFIG += c++1z QMAKE_CXXFLAGS *= -Wall -Wextra -pedantic @@ -103,9 +100,14 @@ QTC_PLUGIN_RECOMMENDS += \ system("$${EXTRA_CMAKE_MODULES_BUILD_CMD}") # Configure KUserFeedback + KUSERFEEDBACK_BUILD_PATH = "$${OUT_PWD}/kuserfeedback/build" + KUSERFEEDBACK_INSTALL_PATH = "$${OUT_PWD}/kuserfeedback" + CMAKE_PREFIX_PATHS = "$$shell_path($$[QT_INSTALL_LIBS]/cmake);$$shell_path($${EXTRA_CMAKE_MODULES_INSTALL_PATH}/share/ECM/cmake)" + BUILD_TYPE = Debug CONFIG(release, debug|release): BUILD_TYPE = Release + system("cmake -S $$shell_path($${KUSERFEEDBACK_SOURCE_PATH}) \ -B $$shell_path($${KUSERFEEDBACK_BUILD_PATH}) \ -DBUILD_SHARED_LIBS=OFF \ @@ -130,6 +132,12 @@ QTC_PLUGIN_RECOMMENDS += \ include($$IDE_SOURCE_TREE/src/qtcreatorplugin.pri) +# Put it here to use qtLibraryName function without extra hacks +LIBS *= -L"$$shell_path($${KUSERFEEDBACK_INSTALL_PATH}/lib)" \ + -l$$qtLibraryName(KUserFeedbackCore) \ + -l$$qtLibraryName(KUserFeedbackWidgets) \ + -l$$qtLibraryName(KUserFeedbackCommon) + FORMS += \ ui/usagestatisticwidget.ui \ ui/encouragementwidget.ui |