diff options
| author | Ivan Komissarov <abbapoh@gmail.com> | 2020-08-19 13:11:46 +0200 |
|---|---|---|
| committer | Ivan Komissarov <ABBAPOH@gmail.com> | 2020-08-20 09:00:21 +0000 |
| commit | b963013ff2ead04fb0ec89ae39ab76edd6ce07be (patch) | |
| tree | cd2d4a47b5aa77f7f0ae276e63f981a7693e0d88 /cmake | |
| parent | 16166a682e6ad6b8c6fce272b0baf7ff924c337d (diff) | |
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>
Diffstat (limited to 'cmake')
| -rw-r--r-- | cmake/QbsAPI.cmake | 4 |
1 files changed, 1 insertions, 3 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} |