celix-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From pnol...@apache.org
Subject celix git commit: CELIX-393: add_bundle does not work with target libraries.
Date Tue, 24 Jan 2017 19:35:23 GMT
Repository: celix
Updated Branches:
  refs/heads/develop bbc654500 -> 2366cd86a


CELIX-393: add_bundle does not work with target libraries.


Project: http://git-wip-us.apache.org/repos/asf/celix/repo
Commit: http://git-wip-us.apache.org/repos/asf/celix/commit/2366cd86
Tree: http://git-wip-us.apache.org/repos/asf/celix/tree/2366cd86
Diff: http://git-wip-us.apache.org/repos/asf/celix/diff/2366cd86

Branch: refs/heads/develop
Commit: 2366cd86a3b4a633d09ad02a7285edaf4c50f580
Parents: bbc6545
Author: Roy Lenferink <lenferinkroy@gmail.com>
Authored: Tue Jan 24 13:58:28 2017 +0100
Committer: Roy Lenferink <lenferinkroy@gmail.com>
Committed: Tue Jan 24 13:58:28 2017 +0100

----------------------------------------------------------------------
 cmake/cmake_celix/Packaging.cmake | 13 +++++++++++--
 1 file changed, 11 insertions(+), 2 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/celix/blob/2366cd86/cmake/cmake_celix/Packaging.cmake
----------------------------------------------------------------------
diff --git a/cmake/cmake_celix/Packaging.cmake b/cmake/cmake_celix/Packaging.cmake
index 881c2fd..cc60c8e 100644
--- a/cmake/cmake_celix/Packaging.cmake
+++ b/cmake/cmake_celix/Packaging.cmake
@@ -262,10 +262,19 @@ SET(CPACK_INCLUDE_TOPLEVEL_DIRECTORY \"0\")
         #do nothing
     else() #ACTIVATOR 
         bundle_private_libs(${BUNDLE_TARGET_NAME} ${BUNDLE_ACTIVATOR})
-        get_filename_component(ACT_NAME ${BUNDLE_ACTIVATOR} NAME)
-        set_target_properties(${BUNDLE_TARGET_NAME} PROPERTIES "BUNDLE_ACTIVATOR" ${ACT_NAME})
+        
+        if(TARGET ${BUNDLE_ACTIVATOR})
+            set_target_properties(${BUNDLE_TARGET_NAME} PROPERTIES "BUNDLE_ACTIVATOR" "$<TARGET_SONAME_FILE_NAME:${BUNDLE_ACTIVATOR}>")
+        elseif(IS_ABSOLUTE ${BUNDLE_ACTIVATOR} AND EXISTS${BUNDLE_ACTIVATOR})
+            get_filename_component(ACT_NAME ${BUNDLE_ACTIVATOR} NAME)
+            set_target_properties(${BUNDLE_TARGET_NAME} PROPERTIES "BUNDLE_ACTIVATOR" "${ACT_NAME}>")
+        else()
+            message(FATAL_ERROR "Provided library (${BUNDLE_ACTIVATOR}) is not a target nor
a absolute path to an existing library")
+        endif()
+
     endif()
 
+
     bundle_private_libs(${BUNDLE_TARGET_NAME} ${BUNDLE_PRIVATE_LIBRARIES})
     bundle_export_libs(${BUNDLE_TARGET_NAME} ${BUNDLE_EXPORT_LIBRARIES})
     bundle_import_libs(${BUNDLE_TARGET_NAME} ${BUNDLE_IMPORT_LIBRARIES})


Mime
View raw message