diff options
| author | Alexander Neundorf <neundorf@kde.org> | 2010-07-28 19:09:22 +0000 |
|---|---|---|
| committer | Alexander Neundorf <neundorf@kde.org> | 2010-07-28 19:09:22 +0000 |
| commit | 2fd2df5f9dc882fb455abcdc4ca9674c8ed9e654 (patch) | |
| tree | 927b98771b2307cf3776141a817280f9d5a04e31 | |
| parent | 50ddbcc1bd2226ba38b3f7a8707430f0319a60a1 (diff) | |
| download | extra-cmake-modules-2fd2df5f9dc882fb455abcdc4ca9674c8ed9e654.tar.gz extra-cmake-modules-2fd2df5f9dc882fb455abcdc4ca9674c8ed9e654.tar.bz2 | |
-extend the documentation for KDE4_ADD_LIBRARY() a bit
-remove wrong comment about WITH_PREFIX
-CMP0011 is now always there since we require cmake 2.6.4
Alex
svn path=/trunk/KDE/kdelibs/; revision=1156242
| -rw-r--r-- | modules/FindKDE4Internal.cmake | 11 | ||||
| -rw-r--r-- | modules/KDE4Macros.cmake | 1 |
2 files changed, 6 insertions, 6 deletions
diff --git a/modules/FindKDE4Internal.cmake b/modules/FindKDE4Internal.cmake index d8a011b5..35f8e507 100644 --- a/modules/FindKDE4Internal.cmake +++ b/modules/FindKDE4Internal.cmake @@ -216,8 +216,11 @@ # to the proper location when installing, so RUN_UNINSTALLED is not necessary anymore). # # KDE4_ADD_LIBRARY (name [STATIC | SHARED | MODULE ] file1 ... fileN) -# Equivalent to ADD_LIBRARY(), but additionally it supports KDE4_ENABLE_FINAL -# and under Windows it adds a -DMAKE_<name>_LIB definition to the compilation. +# Equivalent to ADD_LIBRARY(). Additionally it supports KDE4_ENABLE_FINAL, +# includes automoc-handling and sets LINK_INTERFACE_LIBRARIES target property empty. +# The RPATH is set according to the global RPATH settings as set up by FindKDE4Internal.cmake +# (CMAKE_SKIP_BUILD_RPATH=FALSE, CMAKE_BUILD_WITH_INSTALL_RPATH=FALSE, CMAKE_INSTALL_RPATH_USE_LINK_PATH=TRUE) +# Under Windows it adds a -DMAKE_<name>_LIB definition to the compilation. # # KDE4_ADD_UNIT_TEST (testname [TESTNAME targetname] file1 ... fileN) # add a unit test, which is executed when running make test @@ -347,9 +350,7 @@ cmake_policy(SET CMP0005 OLD) # where this is done, macros and functions are executed with the policies as they # were when the were defined. Keep the OLD behaviour so we can set the policies here # for all KDE software without the big warning -if(POLICY CMP0011) - cmake_policy(SET CMP0011 OLD) -endif(POLICY CMP0011) +cmake_policy(SET CMP0011 OLD) # Only do something if it hasn't been found yet diff --git a/modules/KDE4Macros.cmake b/modules/KDE4Macros.cmake index 9c7f7e59..fc66b481 100644 --- a/modules/KDE4Macros.cmake +++ b/modules/KDE4Macros.cmake @@ -971,7 +971,6 @@ endmacro (KDE4_ADD_EXECUTABLE) macro (KDE4_ADD_LIBRARY _target_NAME _lib_TYPE) -#is the first argument is "WITH_PREFIX" then keep the standard "lib" prefix, otherwise set the prefix empty set(_first_SRC ${_lib_TYPE}) set(_add_lib_param) |