CELIX-335: Fix for deploying bundles using absolute paths
Project: http://git-wip-us.apache.org/repos/asf/celix/repo Commit: http://git-wip-us.apache.org/repos/asf/celix/commit/ea9a5a8d Tree: http://git-wip-us.apache.org/repos/asf/celix/tree/ea9a5a8d Diff: http://git-wip-us.apache.org/repos/asf/celix/diff/ea9a5a8d Branch: refs/heads/release/celix-2.0.0 Commit: ea9a5a8dea580bf050073765559e6b2ec00c8bbf Parents: 3a45281 Author: Pepijn Noltes <[email protected]> Authored: Fri Feb 5 21:30:30 2016 +0100 Committer: Pepijn Noltes <[email protected]> Committed: Fri Feb 5 21:30:30 2016 +0100 ---------------------------------------------------------------------- cmake/cmake_celix/Packaging.cmake | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/celix/blob/ea9a5a8d/cmake/cmake_celix/Packaging.cmake ---------------------------------------------------------------------- diff --git a/cmake/cmake_celix/Packaging.cmake b/cmake/cmake_celix/Packaging.cmake index 0521261..3cb1b71 100644 --- a/cmake/cmake_celix/Packaging.cmake +++ b/cmake/cmake_celix/Packaging.cmake @@ -556,7 +556,7 @@ function(deploy_bundles_dir) foreach(BUNDLE IN ITEMS ${BD_BUNDLES}) if (IS_ABSOLUTE ${BUNDLE} AND EXISTS ${BUNDLE}) get_filename_component(BUNDLE_FILENAME ${BUNDLE} NAME) - set(OUT "${DEPLOY_LOC}/${BD_DIR_NAME}/${BUNDLE_FILENAME}.zip") + set(OUT "${DEPLOY_LOC}/${BD_DIR_NAME}/${BUNDLE_FILENAME}") add_custom_command(OUTPUT ${OUT} COMMAND ${CMAKE_COMMAND} -E copy_if_different ${BUNDLE} ${OUT} COMMENT "Copying bundle '${BUNDLE}' to '${DEPLOY_LOC}/${BD_DIR_NAME}'" @@ -591,7 +591,7 @@ function(deploy_bundles) if(COPY) if(IS_ABSOLUTE ${BUNDLE} AND EXISTS ${BUNDLE}) get_filename_component(BUNDLE_FILENAME ${BUNDLE} NAME) - list(APPEND BUNDLES ${BUNDLE_FILENAME}) + list(APPEND BUNDLES "bundles/${BUNDLE_FILENAME}") else() #assuming target list(APPEND BUNDLES "bundles/${BUNDLE}.zip") endif() @@ -604,7 +604,7 @@ function(deploy_bundles) endif() endforeach() - if(DEPLOY_COPY) + if(COPY) deploy_bundles_dir(${DEPLOY_NAME} DIR_NAME bundles BUNDLES ${ARGN}) endif()
