diff options
| author | Alexander Neundorf <neundorf@kde.org> | 2006-07-04 21:46:37 +0000 |
|---|---|---|
| committer | Alexander Neundorf <neundorf@kde.org> | 2006-07-04 21:46:37 +0000 |
| commit | 349553c7ffe56cc77bce08fd255782c7db8f355b (patch) | |
| tree | 291e22f0e9c9ae700c5659a07b5a7b43f3546ee0 | |
| parent | 26a5b6d0b901f5c6e1c8ef487a95678830ff5dbc (diff) | |
| download | extra-cmake-modules-349553c7ffe56cc77bce08fd255782c7db8f355b.tar.gz extra-cmake-modules-349553c7ffe56cc77bce08fd255782c7db8f355b.tar.bz2 | |
-link kdeinit modules with empty rpath
-don't require a space after the gcc versiuon number
Alex
svn path=/trunk/KDE/kdelibs/; revision=558204
| -rw-r--r-- | modules/FindKDE4Internal.cmake | 2 | ||||
| -rw-r--r-- | modules/KDE4Macros.cmake | 18 |
2 files changed, 11 insertions, 9 deletions
diff --git a/modules/FindKDE4Internal.cmake b/modules/FindKDE4Internal.cmake index c25b9666..ba94f0df 100644 --- a/modules/FindKDE4Internal.cmake +++ b/modules/FindKDE4Internal.cmake @@ -595,7 +595,7 @@ if (CMAKE_COMPILER_IS_GNUCXX) # get information about gcc exec_program(${CMAKE_C_COMPILER} ARGS -v OUTPUT_VARIABLE _gcc_info) - string (REGEX MATCH " [34]\\.[0-9]\\.[0-9] " _gcc_version "${_gcc_info}") + string (REGEX MATCH " [34]\\.[0-9]\\.[0-9]" _gcc_version "${_gcc_info}") macro_ensure_version("4.1.0" "${_gcc_version}" GCC_IS_NEWER_THAN_4_1) if (GCC_IS_NEWER_THAN_4_1) diff --git a/modules/KDE4Macros.cmake b/modules/KDE4Macros.cmake index 6b53e505..45fd4c12 100644 --- a/modules/KDE4Macros.cmake +++ b/modules/KDE4Macros.cmake @@ -461,19 +461,21 @@ macro (KDE4_ADD_KDEINIT_EXECUTABLE _target_NAME ) # KDE4_ADD_EXECUTABLE(${_target_NAME} ${CMAKE_CURRENT_BINARY_DIR}/${_target_NAME}_dummy.cpp ${ARGN} ) # else (WIN32) # under UNIX, create a shared library and a small executable, which links to this library - if (KDE4_ENABLE_FINAL) - kde4_create_final_files(${_target_NAME}_final_cpp.cpp ${_target_NAME}_final_c.c ${_SRCS}) - add_library(kdeinit_${_target_NAME} SHARED ${_target_NAME}_final_cpp.cpp ${_target_NAME}_final_c.c) - if (NOT CMAKE_SKIP_RPATH) - set_target_properties(kdeinit_${_target_NAME} PROPERTIES SKIP_BUILD_RPATH TRUE BUILD_WITH_INSTALL_RPATH TRUE INSTALL_RPATH "") - endif (NOT CMAKE_SKIP_RPATH) + if (KDE4_ENABLE_FINAL) + kde4_create_final_files(${_target_NAME}_final_cpp.cpp ${_target_NAME}_final_c.c ${_SRCS}) + add_library(kdeinit_${_target_NAME} SHARED ${_target_NAME}_final_cpp.cpp ${_target_NAME}_final_c.c) else (KDE4_ENABLE_FINAL) add_library(kdeinit_${_target_NAME} SHARED ${_SRCS} ) endif (KDE4_ENABLE_FINAL) - kde4_add_executable(${_target_NAME} "${_nogui}" "${_uninst}" ${CMAKE_CURRENT_BINARY_DIR}/${_target_NAME}_dummy.cpp) - target_link_libraries(${_target_NAME} kdeinit_${_target_NAME}) + + if (NOT CMAKE_SKIP_RPATH) + set_target_properties(kdeinit_${_target_NAME} PROPERTIES SKIP_BUILD_RPATH TRUE BUILD_WITH_INSTALL_RPATH TRUE INSTALL_RPATH "") + endif (NOT CMAKE_SKIP_RPATH) + + kde4_add_executable(${_target_NAME} "${_nogui}" "${_uninst}" ${CMAKE_CURRENT_BINARY_DIR}/${_target_NAME}_dummy.cpp) + target_link_libraries(${_target_NAME} kdeinit_${_target_NAME}) # endif (WIN32) endmacro (KDE4_ADD_KDEINIT_EXECUTABLE) |