aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorChristian Ehrlicher <ch.ehrlicher@gmx.de>2007-06-16 14:46:22 +0000
committerChristian Ehrlicher <ch.ehrlicher@gmx.de>2007-06-16 14:46:22 +0000
commit6d1204bd641eda05a5ff5b82582d759ebce3ef68 (patch)
tree38dc414a2511e36c3150cb94e364a69f2483e7df
parentb1fc7c8162575b445f0550b524afa439b29564c8 (diff)
downloadextra-cmake-modules-6d1204bd641eda05a5ff5b82582d759ebce3ef68.tar.gz
extra-cmake-modules-6d1204bd641eda05a5ff5b82582d759ebce3ef68.tar.bz2
small fix for MAKE_FOO_EXPORT
svn path=/trunk/KDE/kdelibs/; revision=676284
-rw-r--r--modules/KDE4Macros.cmake5
1 files changed, 4 insertions, 1 deletions
diff --git a/modules/KDE4Macros.cmake b/modules/KDE4Macros.cmake
index afd48e32..0988291b 100644
--- a/modules/KDE4Macros.cmake
+++ b/modules/KDE4Macros.cmake
@@ -649,6 +649,7 @@ macro (KDE4_ADD_PLUGIN _target_NAME _with_PREFIX)
if (WIN32)
# for shared libraries/plugins a -DMAKE_target_LIB is required
string(TOUPPER ${_target_NAME} _symbol)
+ string(REPLACE "-" "_" _symbol ${_symbol})
set(_symbol "MAKE_${_symbol}_LIB")
set_target_properties(${_target_NAME} PROPERTIES DEFINE_SYMBOL ${_symbol})
endif (WIN32)
@@ -850,6 +851,7 @@ macro (KDE4_ADD_LIBRARY _target_NAME _lib_TYPE)
if (WIN32)
# for shared libraries a -DMAKE_target_LIB is required
string(TOUPPER ${_target_NAME} _symbol)
+ string(REPLACE "-" "_" _symbol ${_symbol})
set(_symbol "MAKE_${_symbol}_LIB")
set_target_properties(${_target_NAME} PROPERTIES DEFINE_SYMBOL ${_symbol})
endif (WIN32)
@@ -907,7 +909,8 @@ ENDMACRO(KDE4_NO_ENABLE_FINAL _project_name)
macro(KDE4_CREATE_EXPORTS_HEADER _outputFile _libName)
string(TOUPPER ${_libName} _libNameUpperCase)
- # the next line is is required, because in CMake arguments to macros are not real
+ string(REPLACE "-" "_" _libNameUpperCase ${_libNameUpperCase})
+ # the next line is is required, because in CMake arguments to macros are not real
# variables, but handled differently. The next line create a real CMake variable,
# so configure_file() will replace it correctly.
set(_libName ${_libName})