diff options
| author | Ivan Komissarov <abbapoh@gmail.com> | 2021-03-02 15:51:25 +0300 |
|---|---|---|
| committer | Ivan Komissarov <ABBAPOH@gmail.com> | 2021-03-02 14:02:23 +0000 |
| commit | b99079000697268bdf29c8ae09aa9fc02235edfc (patch) | |
| tree | ca5436eac901c49dbff9cf34d70cf8330b57740a | |
| parent | 87fdf5002673a15f76981302fc9b024bd542b4f4 (diff) | |
| download | qbs-b99079000697268bdf29c8ae09aa9fc02235edfc.tar.gz | |
cmake build: Fix project files updates in Qbs binary
Session class is located in the binary itself, not in the corelib, so we
need to pass this macro there as well. Do that by making this macro
"public" as Qbs build does.
Task-number: QTCREATORBUG-25232
Change-Id: I50b2f8a533db82cf28fd5d29c17fcfdc410c5ab2
Reviewed-by: Eike Ziller <eike.ziller@qt.io>
| -rw-r--r-- | src/lib/corelib/CMakeLists.txt | 1 | ||||
| -rw-r--r-- | tests/auto/api/CMakeLists.txt | 1 |
2 files changed, 1 insertions, 1 deletions
diff --git a/src/lib/corelib/CMakeLists.txt b/src/lib/corelib/CMakeLists.txt index a94a14b37..a687eb0ad 100644 --- a/src/lib/corelib/CMakeLists.txt +++ b/src/lib/corelib/CMakeLists.txt @@ -419,6 +419,7 @@ add_qbs_library(qbscore "QBS_RELATIVE_LIBEXEC_PATH=\"${QBS_RELATIVE_LIBEXEC_PATH}\"" "QBS_LIBRARY" ${QBS_UNIT_TESTS_DEFINES} + PUBLIC_DEFINES ${QBS_PROJECT_FILE_UPDATES_DEFINES} DEPENDS Qt5::CorePrivate Qt5::Gui Qt5::Network Qt5::Script Qt5::Xml ${EXTERNAL_DEPENDS} diff --git a/tests/auto/api/CMakeLists.txt b/tests/auto/api/CMakeLists.txt index 67384d9ac..c1f89972d 100644 --- a/tests/auto/api/CMakeLists.txt +++ b/tests/auto/api/CMakeLists.txt @@ -3,7 +3,6 @@ add_qbs_test(api "QBS_RELATIVE_LIBEXEC_PATH=\"${QBS_RELATIVE_LIBEXEC_PATH}\"" "QBS_RELATIVE_SEARCH_PATH=\"${QBS_RELATIVE_SEARCH_PATH}\"" "QBS_RELATIVE_PLUGINS_PATH=\"${QBS_RELATIVE_PLUGINS_PATH}\"" - ${QBS_PROJECT_FILE_UPDATES_DEFINES} SOURCES tst_api.cpp tst_api.h |