[SCM] Debian Qt/KDE packaging tools branch, master, updated. debian/0.13.1-12-gef732bc

Modestas Vainius modax at alioth.debian.org
Wed May 25 12:11:31 UTC 2011


The following commit has been merged in the master branch:
commit aa9b5d5f8c9999f3a8b6838e5360899f36dc4bee
Author: Modestas Vainius <modax at debian.org>
Date:   Wed May 25 14:17:07 2011 +0300

    DLRestrictionsConfig.cmake: handle MODULE_LIBRARY like SHARED_LIBRARY.
    
    Modules are shared objects as well.
---
 dlrestrictions/DLRestrictionsConfig.cmake |    4 ++--
 1 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/dlrestrictions/DLRestrictionsConfig.cmake b/dlrestrictions/DLRestrictionsConfig.cmake
index 4fb643b..87bd2f2 100644
--- a/dlrestrictions/DLRestrictionsConfig.cmake
+++ b/dlrestrictions/DLRestrictionsConfig.cmake
@@ -31,9 +31,9 @@ function(DLRESTRICTIONS_PROCESS_TARGETS)
             configure_file("${DLRESTRICTIONS_SYMBOL_SOURCE_FILE}" "${dlr_target_file}" @ONLY)
             add_library(${dlr_target} STATIC "${dlr_target_file}")
             get_property(dlr_target_type TARGET ${target} PROPERTY TYPE)
-            if (${dlr_target_type} STREQUAL "SHARED_LIBRARY")
+            if (${dlr_target_type} MATCHES "^(SHARED|MODULE)_LIBRARY$")
                 set_property(TARGET ${dlr_target} PROPERTY COMPILE_FLAGS "${CMAKE_SHARED_LIBRARY_C_FLAGS}" APPEND)
-            endif (${dlr_target_type} STREQUAL "SHARED_LIBRARY")
+            endif (${dlr_target_type} MATCHES "^(SHARED|MODULE)_LIBRARY$")
             set_property(TARGET ${dlr_target} PROPERTY EchoString "Adding DLRestrictions (=${dlr_expression}) for ${target}")
             # FIXME: not portable
             target_link_libraries(${target} "-Wl,--whole-archive" ${dlr_target} "-Wl,--no-whole-archive")

-- 
Debian Qt/KDE packaging tools



More information about the pkg-kde-commits mailing list