diff options
| author | Marc Mutz <mutz@kde.org> | 2007-07-23 16:22:07 +0000 |
|---|---|---|
| committer | Marc Mutz <mutz@kde.org> | 2007-07-23 16:22:07 +0000 |
| commit | d7a84fc9dad43df4723093aa26290e503f515c5e (patch) | |
| tree | cabbfff1070edaa74f73b58aa9d8a9edeb9d72df /modules | |
| parent | 2a29a2307adbadd15d0c46e632b3cb7f0a673193 (diff) | |
| download | extra-cmake-modules-d7a84fc9dad43df4723093aa26290e503f515c5e.tar.gz extra-cmake-modules-d7a84fc9dad43df4723093aa26290e503f515c5e.tar.bz2 | |
Be more robust when creating export macro defines
svn path=/trunk/KDE/kdelibs/; revision=691419
Diffstat (limited to 'modules')
| -rw-r--r-- | modules/KDE4Macros.cmake | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/modules/KDE4Macros.cmake b/modules/KDE4Macros.cmake index 492cf8b3..483ce233 100644 --- a/modules/KDE4Macros.cmake +++ b/modules/KDE4Macros.cmake @@ -564,7 +564,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}) + string(REPLACE "[^_A-Za-z0-9]" "_" _symbol ${_symbol}) set(_symbol "MAKE_${_symbol}_LIB") set_target_properties(${_target_NAME} PROPERTIES DEFINE_SYMBOL ${_symbol}) endif (WIN32) @@ -785,7 +785,7 @@ macro (KDE4_ADD_LIBRARY _target_NAME _lib_TYPE) # for shared libraries a -DMAKE_target_LIB is required string(TOUPPER ${_target_NAME} _symbol) - string(REPLACE "-" "_" _symbol ${_symbol}) + string(REPLACE "[^_A-Za-z0-9]" "_" _symbol ${_symbol}) set(_symbol "MAKE_${_symbol}_LIB") set_target_properties(${_target_NAME} PROPERTIES DEFINE_SYMBOL ${_symbol}) @@ -842,7 +842,7 @@ ENDMACRO(KDE4_NO_ENABLE_FINAL _project_name) macro(KDE4_CREATE_EXPORTS_HEADER _outputFile _libName) string(TOUPPER ${_libName} _libNameUpperCase) - string(REPLACE "-" "_" _libNameUpperCase ${_libNameUpperCase}) + string(REPLACE "[^_A-Za-z0-9]" "_" _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. |