diff options
| author | Alexander Neundorf <neundorf@kde.org> | 2008-07-19 13:35:17 +0000 |
|---|---|---|
| committer | Alexander Neundorf <neundorf@kde.org> | 2008-07-19 13:35:17 +0000 |
| commit | c4503f753b9af4e676c8d42e3c8659fc0a7445aa (patch) | |
| tree | 9be94a49d245e35b421dfec7073e249571e4d456 | |
| parent | c0c1c612fb548a668664dc380a3b9b75db75283e (diff) | |
| download | extra-cmake-modules-c4503f753b9af4e676c8d42e3c8659fc0a7445aa.tar.gz extra-cmake-modules-c4503f753b9af4e676c8d42e3c8659fc0a7445aa.tar.bz2 | |
-synch with trunk:
-some formatting
-KDE_DEFAULT_HOME is now a cache variable
-fix for the link interface libs from Dirk
-fix for targets with "-" in their name from Christian
Alex
svn path=/branches/KDE/4.1/kdelibs/; revision=834700
| -rw-r--r-- | modules/KDE4Macros.cmake | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/modules/KDE4Macros.cmake b/modules/KDE4Macros.cmake index 6da11793..4374c6fe 100644 --- a/modules/KDE4Macros.cmake +++ b/modules/KDE4Macros.cmake @@ -657,6 +657,7 @@ macro (KDE4_ADD_KDEINIT_EXECUTABLE _target_NAME ) # keep the library there- if(WIN32) set(_KDEINIT4_TARGET_NAME_ ${_target_NAME}) + string(REGEX REPLACE "[-]" "_" _KDEINIT4_TARGET_NAME_ "${_KDEINIT4_TARGET_NAME_}") configure_file(${KDE4_MODULE_DIR}/kde4init_win32lib_dummy.cpp.in ${CMAKE_CURRENT_BINARY_DIR}/${_target_NAME}_win32lib_dummy.cpp) add_library(kdeinit_${_target_NAME} STATIC ${CMAKE_CURRENT_BINARY_DIR}/${_target_NAME}_win32lib_dummy.cpp) @@ -1117,7 +1118,7 @@ endmacro(_KDE4_EXPORT_LIBRARY_DEPENDENCIES) macro (KDE4_TARGET_LINK_INTERFACE_LIBRARIES _target _interface_libs) if(KDE4_ENABLE_EXPERIMENTAL_LIB_EXPORT AND UNIX )# AND NOT APPLE) - set_target_properties("${_target}" "${_interface_libs}") + set_target_properties("${_target}" PROPERTIES LINK_INTERFACE_LIBRARIES "${_interface_libs}") endif(KDE4_ENABLE_EXPERIMENTAL_LIB_EXPORT AND UNIX)# AND NOT APPLE) endmacro (KDE4_TARGET_LINK_INTERFACE_LIBRARIES) |