diff options
author | Ivan Komissarov <abbapoh@gmail.com> | 2020-08-20 13:16:53 +0200 |
---|---|---|
committer | Ivan Komissarov <ABBAPOH@gmail.com> | 2020-08-20 16:05:02 +0000 |
commit | cb4875d06b989c6af59c5989daf224c61e49b10b (patch) | |
tree | ad4e5497ce37bfc15f6c5c7500f3b772c70b04cb | |
parent | b105f091dcd6c92e25efdfbc4018cdd76e0aeaab (diff) | |
download | qbs-cb4875d06b989c6af59c5989daf224c61e49b10b.tar.gz |
cmake: rename qbslogging -> qbsconsolelogger
...to match the Qbs build
Change-Id: Ib17d9625bf06d2eed69f51cc0e6e6cbe7ba99085
Reviewed-by: Christian Kandeler <christian.kandeler@qt.io>
-rw-r--r-- | cmake/QbsAPI.cmake | 2 | ||||
-rw-r--r-- | src/app/config-ui/CMakeLists.txt | 2 | ||||
-rw-r--r-- | src/app/config/CMakeLists.txt | 2 | ||||
-rw-r--r-- | src/app/qbs-create-project/CMakeLists.txt | 2 | ||||
-rw-r--r-- | src/app/qbs-setup-android/CMakeLists.txt | 2 | ||||
-rw-r--r-- | src/app/qbs-setup-qt/CMakeLists.txt | 2 | ||||
-rw-r--r-- | src/app/qbs-setup-toolchains/CMakeLists.txt | 2 | ||||
-rw-r--r-- | src/app/qbs/CMakeLists.txt | 2 | ||||
-rw-r--r-- | src/app/shared/logging/CMakeLists.txt | 4 |
9 files changed, 10 insertions, 10 deletions
diff --git a/cmake/QbsAPI.cmake b/cmake/QbsAPI.cmake index b3a4d3712..071d50259 100644 --- a/cmake/QbsAPI.cmake +++ b/cmake/QbsAPI.cmake @@ -194,7 +194,7 @@ function(add_qbs_test test_name) ) target_link_libraries( ${target_name} - PRIVATE ${_arg_DEPENDS} qbscore qbslogging Qt5::Test + PRIVATE ${_arg_DEPENDS} qbscore qbsconsolelogger Qt5::Test PUBLIC ${_arg_PUBLIC_DEPENDS} ) diff --git a/src/app/config-ui/CMakeLists.txt b/src/app/config-ui/CMakeLists.txt index 2993188d0..47b9c1905 100644 --- a/src/app/config-ui/CMakeLists.txt +++ b/src/app/config-ui/CMakeLists.txt @@ -14,6 +14,6 @@ if(APPLE) endif() add_qbs_app(qbs-config-ui - DEPENDS qbscore qbslogging Qt5::Widgets ${MACOS_FRAMEWORKS} + DEPENDS qbscore qbsconsolelogger Qt5::Widgets ${MACOS_FRAMEWORKS} SOURCES ${SOURCES} ${MACOS_SOURCES} ) diff --git a/src/app/config/CMakeLists.txt b/src/app/config/CMakeLists.txt index 3db2c4df8..064d8fb22 100644 --- a/src/app/config/CMakeLists.txt +++ b/src/app/config/CMakeLists.txt @@ -8,6 +8,6 @@ set(SOURCES ) add_qbs_app(qbs-config - DEPENDS qbscore qbslogging + DEPENDS qbscore qbsconsolelogger SOURCES ${SOURCES} ) diff --git a/src/app/qbs-create-project/CMakeLists.txt b/src/app/qbs-create-project/CMakeLists.txt index 3433f5226..a627d11ff 100644 --- a/src/app/qbs-create-project/CMakeLists.txt +++ b/src/app/qbs-create-project/CMakeLists.txt @@ -5,6 +5,6 @@ set(SOURCES ) add_qbs_app(qbs-create-project - DEPENDS qbscore qbslogging + DEPENDS qbscore qbsconsolelogger SOURCES ${SOURCES} ) diff --git a/src/app/qbs-setup-android/CMakeLists.txt b/src/app/qbs-setup-android/CMakeLists.txt index ff54d6648..46930318b 100644 --- a/src/app/qbs-setup-android/CMakeLists.txt +++ b/src/app/qbs-setup-android/CMakeLists.txt @@ -7,6 +7,6 @@ set(SOURCES ) add_qbs_app(qbs-setup-android - DEPENDS qbscore qbslogging + DEPENDS qbscore qbsconsolelogger SOURCES ${SOURCES} ) diff --git a/src/app/qbs-setup-qt/CMakeLists.txt b/src/app/qbs-setup-qt/CMakeLists.txt index bab8bdaeb..a91ab1b26 100644 --- a/src/app/qbs-setup-qt/CMakeLists.txt +++ b/src/app/qbs-setup-qt/CMakeLists.txt @@ -7,6 +7,6 @@ set(SOURCES ) add_qbs_app(qbs-setup-qt - DEPENDS qbscore qbslogging + DEPENDS qbscore qbsconsolelogger SOURCES ${SOURCES} ) diff --git a/src/app/qbs-setup-toolchains/CMakeLists.txt b/src/app/qbs-setup-toolchains/CMakeLists.txt index c6be7469d..d23221c73 100644 --- a/src/app/qbs-setup-toolchains/CMakeLists.txt +++ b/src/app/qbs-setup-toolchains/CMakeLists.txt @@ -21,6 +21,6 @@ set(SOURCES ) add_qbs_app(qbs-setup-toolchains - DEPENDS qbscore qbslogging + DEPENDS qbscore qbsconsolelogger SOURCES ${SOURCES} ) diff --git a/src/app/qbs/CMakeLists.txt b/src/app/qbs/CMakeLists.txt index ed0f9e3dc..c190efccc 100644 --- a/src/app/qbs/CMakeLists.txt +++ b/src/app/qbs/CMakeLists.txt @@ -43,7 +43,7 @@ add_qbs_app(qbs "QBS_RELATIVE_LIBEXEC_PATH=\"${QBS_RELATIVE_LIBEXEC_PATH}\"" "QBS_RELATIVE_SEARCH_PATH=\"${QBS_RELATIVE_SEARCH_PATH}\"" "QBS_RELATIVE_PLUGINS_PATH=\"${QBS_RELATIVE_PLUGINS_PATH}\"" - DEPENDS qbscore qbslogging + DEPENDS qbscore qbsconsolelogger SOURCES ${SOURCES} ${PARSER_SOURCES} ) diff --git a/src/app/shared/logging/CMakeLists.txt b/src/app/shared/logging/CMakeLists.txt index 9ce06fb55..159b9eaef 100644 --- a/src/app/shared/logging/CMakeLists.txt +++ b/src/app/shared/logging/CMakeLists.txt @@ -5,9 +5,9 @@ set(SOURCES consolelogger.h ) -add_qbs_library(qbslogging +add_qbs_library(qbsconsolelogger STATIC DEPENDS qbscore - PUBLIC_INCLUDES $<BUILD_INTERFACE:${CMAKE_CURRENT_SOURCE_DIR}/../> + PUBLIC_INCLUDES $<BUILD_INTERFACE:${CMAKE_CURRENT_SOURCE_DIR}> SOURCES ${SOURCES} ) |