aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDavid Faure <faure@kde.org>2009-07-12 22:36:18 +0000
committerDavid Faure <faure@kde.org>2009-07-12 22:36:18 +0000
commit76f5a21cccb8f7ca92179d59508f2045176361d1 (patch)
tree9fa1299f2e31b5164d7329467efb56a1b0e5b839
parent8c8c2aed4dc51306106a4bbc7e14a8cd5e72acaa (diff)
downloadextra-cmake-modules-76f5a21cccb8f7ca92179d59508f2045176361d1.tar.gz
extra-cmake-modules-76f5a21cccb8f7ca92179d59508f2045176361d1.tar.bz2
Always define MAKE_FOO_LIB, not only on Windows. This is used in konqueror to know when to enable KDE_TESTS_EXPORT.
What I don't understand, is why it worked before; konqprivate_export.h always relied on MAKE_KDEINIT_KONQUEROR_LIB... (and without this commit, konqviewmgrtest failed with undefined symbol KonqSettings::self(), which is logical) CCMAIL: kde-buildsystem@kde.org svn path=/branches/KDE/4.3/kdelibs/; revision=995533
-rw-r--r--modules/KDE4Macros.cmake12
1 files changed, 5 insertions, 7 deletions
diff --git a/modules/KDE4Macros.cmake b/modules/KDE4Macros.cmake
index 17a8065e..cf33ad35 100644
--- a/modules/KDE4Macros.cmake
+++ b/modules/KDE4Macros.cmake
@@ -574,13 +574,11 @@ macro (KDE4_ADD_PLUGIN _target_NAME _with_PREFIX)
set_target_properties(${_target_NAME} PROPERTIES PREFIX "")
endif (_first_SRC)
- if (WIN32)
- # for shared libraries/plugins a -DMAKE_target_LIB is required
- string(TOUPPER ${_target_NAME} _symbol)
- string(REGEX REPLACE "[^_A-Za-z0-9]" "_" _symbol ${_symbol})
- set(_symbol "MAKE_${_symbol}_LIB")
- set_target_properties(${_target_NAME} PROPERTIES DEFINE_SYMBOL ${_symbol})
- endif (WIN32)
+ # for shared libraries/plugins a -DMAKE_target_LIB is required
+ string(TOUPPER ${_target_NAME} _symbol)
+ string(REGEX REPLACE "[^_A-Za-z0-9]" "_" _symbol ${_symbol})
+ set(_symbol "MAKE_${_symbol}_LIB")
+ set_target_properties(${_target_NAME} PROPERTIES DEFINE_SYMBOL ${_symbol})
endmacro (KDE4_ADD_PLUGIN _target_NAME _with_PREFIX)