CMake: Fix QTC_STATIC_BUILD

Change-Id: Idfcd36f2d5fdaf09c958ff101aa5e83e0a29cb58
Reviewed-by: Eike Ziller <eike.ziller@qt.io>

cmake/Findyaml-cpp.cmake

@@ -123,7 +123,10 @@ else()
       ${YAML_SOURCE_DIR}/src/tag.h
       ${YAML_SOURCE_DIR}/src/token.h
     )
-    if (NOT QTC_STATIC_BUILD)
+    if (QTC_STATIC_BUILD)
+      extend_qtc_target(yaml-cpp
+        PUBLIC_DEFINES YAML_CPP_STATIC_DEFINE)
+    else()
       extend_qtc_target(yaml-cpp
         DEFINES yaml_cpp_EXPORTS
         PUBLIC_DEFINES YAML_CPP_DLL)

cmake/QtCreatorAPI.cmake

@@ -211,9 +211,14 @@ function(add_qtc_library name)
   )
 
   if (QTC_STATIC_BUILD)
-    extend_qtc_target(${name} PUBLIC_DEFINES ${EXPORT_SYMBOL})
+    extend_qtc_target(${name}
+      DEFINES ${EXPORT_SYMBOL}
+      PUBLIC_DEFINES ${EXPORT_SYMBOL})
   else()
     extend_qtc_target(${name} DEFINES ${EXPORT_SYMBOL})
+    if (_arg_OBJECT OR _arg_STATIC)
+      extend_qtc_target(${name} PUBLIC_DEFINES ${EXPORT_SYMBOL})
+    endif()
   endif()
 
   # everything is different with SOURCES_PREFIX

src/libs/nanotrace/CMakeLists.txt

@@ -1,6 +1,5 @@
 add_qtc_library(Nanotrace
   BUILD_DEFAULT OFF
-  DEFINES NANOTRACE_LIBRARY
   PUBLIC_DEFINES NANOTRACE_ENABLED
   SOURCES nanotrace.cpp nanotrace.h
   PUBLIC_DEPENDS Qt::Core

src/libs/nanotrace/nanotrace.h

@@ -7,6 +7,8 @@
 
 #if defined(NANOTRACE_LIBRARY)
 #  define NANOTRACESHARED_EXPORT Q_DECL_EXPORT
+#elif defined(NANOTRACE_STATIC_LIBRARY)
+#  define NANOTRACESHARED_EXPORT
 #else
 #  define NANOTRACESHARED_EXPORT Q_DECL_IMPORT
 #endif

src/libs/solutions/spinner/CMakeLists.txt

@@ -1,7 +1,6 @@
 add_qtc_library(Spinner OBJECT
 # Never add dependencies to non-Qt libraries for this library
   DEPENDS Qt::Core Qt::Widgets
-  PUBLIC_DEFINES SPINNER_LIBRARY
   SOURCES
     spinner.cpp spinner.h
     spinner.qrc

src/libs/solutions/tasking/CMakeLists.txt

@@ -1,7 +1,6 @@
 add_qtc_library(Tasking OBJECT
 # Never add dependencies to non-Qt libraries for this library
   DEPENDS Qt::Concurrent Qt::Core Qt::Network
-  PUBLIC_DEFINES TASKING_LIBRARY
   SOURCES
     barrier.cpp barrier.h
     concurrentcall.h

src/libs/utils/CMakeLists.txt

@@ -3,6 +3,8 @@ add_qtc_library(Utils
   PUBLIC_DEPENDS
     Qt::Concurrent Qt::Core Qt::Network Qt::Gui Qt::Widgets
     Qt::Core5Compat
+    $<$<BOOL:${QTC_STATIC_BUILD}>:Tasking>
+    $<$<BOOL:${QTC_STATIC_BUILD}>:Spinner>
   SOURCES
     ../3rdparty/span/span.hpp
     ../3rdparty/tl_expected/include/tl/expected.hpp

src/libs/utils/externalterminalprocessimpl.cpp

@@ -12,7 +12,7 @@
 #include <QTemporaryFile>
 #include <QVersionNumber>
 
-Q_LOGGING_CATEGORY(log, "terminal.externalprocess", QtWarningMsg)
+Q_LOGGING_CATEGORY(logTE, "terminal.externalprocess", QtWarningMsg)
 
 namespace Utils {
 
@@ -155,12 +155,12 @@ expected_str<qint64> ProcessStubCreator::startStubProcess(const ProcessSetupData
             QObject::connect(process, &Process::readyReadStandardOutput, process, [process] {
                 const QString output = process->readAllStandardOutput();
                 if (!output.isEmpty())
-                    qCWarning(log).noquote() << output;
+                    qCWarning(logTE).noquote() << output;
             });
             QObject::connect(process, &Process::readyReadStandardError, process, [process] {
                 const QString output = process->readAllStandardError();
                 if (!output.isEmpty())
-                    qCCritical(log).noquote() << output;
+                    qCCritical(logTE).noquote() << output;
             });
 
             QObject::connect(process, &Process::done, m_interface, &TerminalInterface::onStubExited);

src/plugins/qmldesigner/CMakeLists.txt

@@ -18,8 +18,6 @@ add_feature_info("ProjectStorage" ${USE_PROJECTSTORAGE} "")
 add_qtc_library(QmlDesignerUtils STATIC
   DEPENDS
     Qt::Gui Utils Qt::QmlPrivate Core
-  DEFINES QMLDESIGNERUTILS_LIBRARY
-  PUBLIC_DEFINES $<$<BOOL:${QTC_STATIC_BUILD}>:QMLDESIGNER_STATIC_LIBRARY>
 
   PUBLIC_INCLUDES ${CMAKE_CURRENT_LIST_DIR}/utils
   SOURCES_PREFIX ${CMAKE_CURRENT_LIST_DIR}/utils
@@ -69,8 +67,6 @@ add_qtc_library(QmlDesignerCore STATIC
     TextEditor
     Sqlite
   DEFINES
-     QMLDESIGNERCORE_LIBRARY
-     QMLDESIGNERUTILS_LIBRARY
      $<$<BOOL:${USE_PROJECTSTORAGE}>:QDS_USE_PROJECTSTORAGE>
   INCLUDES
     ${CMAKE_CURRENT_LIST_DIR}
@@ -443,7 +439,6 @@ add_qtc_plugin(QmlDesigner
     IDE_LIBRARY_BASENAME=\"${IDE_LIBRARY_BASE_PATH}\"
     SHARE_QML_PATH="${CMAKE_CURRENT_SOURCE_DIR}/../../../share/qtcreator/qmldesigner"
     $<$<BOOL:${USE_PROJECTSTORAGE}>:QDS_USE_PROJECTSTORAGE>
-    QMLDESIGNER_LIBRARY QMLDESIGNERCORE_LIBRARY QMLDESIGNERUTILS_LIBRARY
   INCLUDES
     ${CMAKE_CURRENT_LIST_DIR}/components
     ${CMAKE_CURRENT_LIST_DIR}/components/assetslibrary

src/plugins/studiowelcome/studiowelcome_global.h

@@ -7,6 +7,8 @@
 
 #if defined(STUDIOWELCOME_LIBRARY)
 #  define STUDIOWELCOME_EXPORT Q_DECL_EXPORT
+#elif defined(STUDIOWELCOME_STATIC_LIBRARY)
+#  define STUDIOWELCOME_EXPORT
 #else
 #  define STUDIOWELCOME_EXPORT Q_DECL_IMPORT
 #endif