cmake: Fix target names

It should be 'qbscore', not 'corelib'. Same for the static logging
library.

This amends b67b08f1c2c.

Change-Id: I3b79ce75168360f8708b143471f0b4c223b2f5fd
Reviewed-by: Christian Kandeler <christian.kandeler@qt.io>

17 files changed, 18 insertions, 18 deletions

diff --git a/src/app/config-ui/CMakeLists.txt b/src/app/config-ui/CMakeLists.txt
index bced804c2..2993188d0 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 corelib logginglib Qt5::Widgets ${MACOS_FRAMEWORKS}
+    DEPENDS qbscore qbslogging Qt5::Widgets ${MACOS_FRAMEWORKS}
     SOURCES ${SOURCES} ${MACOS_SOURCES}
     )
diff --git a/src/app/config/CMakeLists.txt b/src/app/config/CMakeLists.txt
index 67dd78483..3db2c4df8 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 corelib logginglib
+    DEPENDS qbscore qbslogging
     SOURCES ${SOURCES}
     )
diff --git a/src/app/qbs-create-project/CMakeLists.txt b/src/app/qbs-create-project/CMakeLists.txt
index b3c1f75f5..3433f5226 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 corelib logginglib
+    DEPENDS qbscore qbslogging
     SOURCES ${SOURCES}
     )
diff --git a/src/app/qbs-setup-android/CMakeLists.txt b/src/app/qbs-setup-android/CMakeLists.txt
index 97d0c8a60..ff54d6648 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 corelib logginglib
+    DEPENDS qbscore qbslogging
     SOURCES ${SOURCES}
     )
diff --git a/src/app/qbs-setup-qt/CMakeLists.txt b/src/app/qbs-setup-qt/CMakeLists.txt
index 55b86e3a2..bab8bdaeb 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 corelib logginglib
+    DEPENDS qbscore qbslogging
     SOURCES ${SOURCES}
     )
diff --git a/src/app/qbs-setup-toolchains/CMakeLists.txt b/src/app/qbs-setup-toolchains/CMakeLists.txt
index 9dc610bd3..c6be7469d 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 corelib logginglib
+    DEPENDS qbscore qbslogging
     SOURCES ${SOURCES}
     )
diff --git a/src/app/qbs/CMakeLists.txt b/src/app/qbs/CMakeLists.txt
index 009130426..ed0f9e3dc 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 corelib logginglib
+    DEPENDS qbscore qbslogging
     SOURCES ${SOURCES} ${PARSER_SOURCES}
     )
 
diff --git a/src/app/shared/logging/CMakeLists.txt b/src/app/shared/logging/CMakeLists.txt
index 8fbeed184..9ce06fb55 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(logginglib
+add_qbs_library(qbslogging
     STATIC
-    DEPENDS corelib
+    DEPENDS qbscore
     PUBLIC_INCLUDES $<BUILD_INTERFACE:${CMAKE_CURRENT_SOURCE_DIR}/../>
     SOURCES ${SOURCES}
     )
diff --git a/src/lib/corelib/CMakeLists.txt b/src/lib/corelib/CMakeLists.txt
index 2dfaf225c..e495b4a13 100644
--- a/src/lib/corelib/CMakeLists.txt
+++ b/src/lib/corelib/CMakeLists.txt
@@ -413,7 +413,7 @@ if(WIN32)
     set(EXTERNAL_DEPENDS "psapi" "shell32")
 endif()
 
-add_qbs_library(corelib
+add_qbs_library(qbscore
     DEFINES
         "QBS_VERSION=\"${QBS_VERSION}\""
         "QBS_RELATIVE_LIBEXEC_PATH=\"${QBS_RELATIVE_LIBEXEC_PATH}\""
diff --git a/src/lib/msbuild/CMakeLists.txt b/src/lib/msbuild/CMakeLists.txt
index bce7a1dcf..c908ed2d3 100644
--- a/src/lib/msbuild/CMakeLists.txt
+++ b/src/lib/msbuild/CMakeLists.txt
@@ -67,6 +67,6 @@ list_transform_prepend(IO_SOURCES io/)
 
 add_qbs_library(qbsmsbuild
     STATIC
-    DEPENDS corelib
+    DEPENDS qbscore
     SOURCES ${SOLUTION_SOURCES} ${MSBUILD_SOURCES} ${MSBUILD_ITEMS_SOURCES} ${IO_SOURCES}
     )
diff --git a/src/plugins/generator/clangcompilationdb/CMakeLists.txt b/src/plugins/generator/clangcompilationdb/CMakeLists.txt
index b7c50b746..237ae4650 100644
--- a/src/plugins/generator/clangcompilationdb/CMakeLists.txt
+++ b/src/plugins/generator/clangcompilationdb/CMakeLists.txt
@@ -5,6 +5,6 @@ set(SOURCES
     )
 
 add_qbs_plugin(clangcompilationdbgenerator
-    DEPENDS corelib
+    DEPENDS qbscore
     SOURCES ${SOURCES}
     )
diff --git a/src/plugins/generator/iarew/CMakeLists.txt b/src/plugins/generator/iarew/CMakeLists.txt
index e08f3ff9d..32af6e282 100644
--- a/src/plugins/generator/iarew/CMakeLists.txt
+++ b/src/plugins/generator/iarew/CMakeLists.txt
@@ -108,7 +108,7 @@ set(ARCHS_MSP430_SOURCES
 list_transform_prepend(ARCHS_MSP430_SOURCES archs/msp430/)
 
 add_qbs_plugin(iarewgenerator
-    DEPENDS corelib qbsjson
+    DEPENDS qbscore qbsjson
     SOURCES
         ${COMMON_SOURCES}
         ${ARCHS_ARM_SOURCES}
diff --git a/src/plugins/generator/keiluv/CMakeLists.txt b/src/plugins/generator/keiluv/CMakeLists.txt
index 68229a2bc..3b4afbe16 100644
--- a/src/plugins/generator/keiluv/CMakeLists.txt
+++ b/src/plugins/generator/keiluv/CMakeLists.txt
@@ -72,7 +72,7 @@ set(ARCHS_MCS51_SOURCES
 list_transform_prepend(ARCHS_MCS51_SOURCES archs/mcs51/)
 
 add_qbs_plugin(keiluvgenerator
-    DEPENDS corelib qbsjson
+    DEPENDS qbscore qbsjson
     SOURCES
         ${COMMON_SOURCES}
         ${ARCHS_ARM_SOURCES}
diff --git a/src/plugins/generator/makefilegenerator/CMakeLists.txt b/src/plugins/generator/makefilegenerator/CMakeLists.txt
index bf6abae73..8e6e3510a 100644
--- a/src/plugins/generator/makefilegenerator/CMakeLists.txt
+++ b/src/plugins/generator/makefilegenerator/CMakeLists.txt
@@ -5,6 +5,6 @@ set(SOURCES
     )
 
 add_qbs_plugin(makefilegenerator
-    DEPENDS corelib
+    DEPENDS qbscore
     SOURCES ${SOURCES}
     )
diff --git a/src/plugins/generator/visualstudio/CMakeLists.txt b/src/plugins/generator/visualstudio/CMakeLists.txt
index cd83e0b66..01d0abbfa 100644
--- a/src/plugins/generator/visualstudio/CMakeLists.txt
+++ b/src/plugins/generator/visualstudio/CMakeLists.txt
@@ -20,6 +20,6 @@ set(SOURCES
     )
 
 add_qbs_plugin(visualstudiogenerator
-    DEPENDS corelib qbsmsbuild qbsjson
+    DEPENDS qbscore qbsmsbuild qbsjson
     SOURCES ${SOURCES}
     )
diff --git a/src/plugins/scanner/cpp/CMakeLists.txt b/src/plugins/scanner/cpp/CMakeLists.txt
index b394dd74d..a05b70a27 100644
--- a/src/plugins/scanner/cpp/CMakeLists.txt
+++ b/src/plugins/scanner/cpp/CMakeLists.txt
@@ -11,6 +11,6 @@ set(SOURCES
 
 add_qbs_plugin(qbs_cpp_scanner
     DEFINES "CPLUSPLUS_NO_PARSER"
-    DEPENDS corelib
+    DEPENDS qbscore
     SOURCES ${SOURCES}
     )
diff --git a/src/plugins/scanner/qt/CMakeLists.txt b/src/plugins/scanner/qt/CMakeLists.txt
index 69771fa3a..9a3649ad4 100644
--- a/src/plugins/scanner/qt/CMakeLists.txt
+++ b/src/plugins/scanner/qt/CMakeLists.txt
@@ -1,4 +1,4 @@
 add_qbs_plugin(qbs_qt_scanner
-    DEPENDS corelib
+    DEPENDS qbscore
     SOURCES ../scanner.h qtscanner.cpp
     )