From b963013ff2ead04fb0ec89ae39ab76edd6ce07be Mon Sep 17 00:00:00 2001
From: Ivan Komissarov <abbapoh@gmail.com>
Date: Wed, 19 Aug 2020 13:11:46 +0200
Subject: cmake: Fix export macros in add_qbs_library

We should not set those macros in the function, but we should set them
independently for each target, otherwise the import/export macros for
qbscore will be messed up.

This amends b67b08f1c2c.

Change-Id: Iff61ce050cd6c4c4e71d3e3e6a97cc3525459a39
Reviewed-by: Christian Kandeler <christian.kandeler@qt.io>
---
 cmake/QbsAPI.cmake                    | 4 +---
 src/lib/corelib/CMakeLists.txt        | 1 +
 src/lib/corelib/tools/preferences.cpp | 2 --
 src/lib/corelib/tools/preferences.h   | 1 -
 4 files changed, 2 insertions(+), 6 deletions(-)

diff --git a/cmake/QbsAPI.cmake b/cmake/QbsAPI.cmake
index 3ab733cb0..9f170b0b6 100644
--- a/cmake/QbsAPI.cmake
+++ b/cmake/QbsAPI.cmake
@@ -104,10 +104,8 @@ function(add_qbs_library target_name)
     endif()
 
     set(library_type SHARED)
-    set(library_define "QBS_LIBRARY")
     if (_arg_STATIC)
         set(library_type STATIC)
-        set(library_define "QBS_STATIC_LIB")
     endif()
 
     string(REGEX REPLACE "\\.[0..9]+$" "" _SOVERSION ${QBS_VERSION})
@@ -115,7 +113,7 @@ function(add_qbs_library target_name)
     add_library(${target_name} ${library_type} ${_arg_SOURCES})
     target_compile_definitions(
         ${target_name}
-        PRIVATE ${_arg_DEFINES} ${library_define} ${DEFAULT_DEFINES}
+        PRIVATE ${_arg_DEFINES} ${DEFAULT_DEFINES}
         PUBLIC ${_arg_PUBLIC_DEFINES})
     target_include_directories(
         ${target_name}
diff --git a/src/lib/corelib/CMakeLists.txt b/src/lib/corelib/CMakeLists.txt
index e495b4a13..a94a14b37 100644
--- a/src/lib/corelib/CMakeLists.txt
+++ b/src/lib/corelib/CMakeLists.txt
@@ -417,6 +417,7 @@ add_qbs_library(qbscore
     DEFINES
         "QBS_VERSION=\"${QBS_VERSION}\""
         "QBS_RELATIVE_LIBEXEC_PATH=\"${QBS_RELATIVE_LIBEXEC_PATH}\""
+        "QBS_LIBRARY"
         ${QBS_UNIT_TESTS_DEFINES}
         ${QBS_PROJECT_FILE_UPDATES_DEFINES}
     DEPENDS
diff --git a/src/lib/corelib/tools/preferences.cpp b/src/lib/corelib/tools/preferences.cpp
index 42fb5002a..fe669e163 100644
--- a/src/lib/corelib/tools/preferences.cpp
+++ b/src/lib/corelib/tools/preferences.cpp
@@ -63,8 +63,6 @@ Preferences::Preferences(Settings *settings, QVariantMap profileContents)
 {
 }
 
-Preferences::~Preferences() = default;
-
 /*!
  * \brief Returns true <=> colored output should be used for printing messages.
  * This is only relevant for command-line frontends.
diff --git a/src/lib/corelib/tools/preferences.h b/src/lib/corelib/tools/preferences.h
index 517bd442b..2824ebf2c 100644
--- a/src/lib/corelib/tools/preferences.h
+++ b/src/lib/corelib/tools/preferences.h
@@ -56,7 +56,6 @@ class QBS_EXPORT Preferences
 public:
     explicit Preferences(Settings *settings, QString profileName = QString());
     Preferences(Settings *settings, QVariantMap profileContents);
-    ~Preferences();
 
     bool useColoredOutput() const;
     int jobs() const;
-- 
cgit v1.2.3