You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@celix.apache.org by pn...@apache.org on 2014/09/18 15:35:34 UTC
svn commit: r1625975 - /celix/trunk/cmake/cmake_celix/Packaging.cmake
Author: pnoltes
Date: Thu Sep 18 13:35:34 2014
New Revision: 1625975
URL: http://svn.apache.org/r1625975
Log:
CELIX-144: fixed a problem in the deploy macro. The macro will now first check if the provided bundle is an absolute path; the expression EXISTS has undefined behaviour when used on a non absolute path (e.g only a bundle name).
Modified:
celix/trunk/cmake/cmake_celix/Packaging.cmake
Modified: celix/trunk/cmake/cmake_celix/Packaging.cmake
URL: http://svn.apache.org/viewvc/celix/trunk/cmake/cmake_celix/Packaging.cmake?rev=1625975&r1=1625974&r2=1625975&view=diff
==============================================================================
--- celix/trunk/cmake/cmake_celix/Packaging.cmake (original)
+++ celix/trunk/cmake/cmake_celix/Packaging.cmake Thu Sep 18 13:35:34 2014
@@ -336,7 +336,7 @@ MACRO(deploy)
FOREACH(BUNDLE ${DEPLOY_BUNDLES})
SET(DEP_NAME ${DEPLOY_NAME}_${BUNDLE})
- IF(EXISTS ${BUNDLE}) #it is a full path not a bundle name (e.g. a target)
+ IF(IS_ABSOLUTE ${BUNDLE} AND EXISTS ${BUNDLE}) #it is a full path not a bundle name (e.g. a target)
get_filename_component(BUNDLE_NAME ${BUNDLE} NAME_WE)
add_custom_command(OUTPUT ${CMAKE_CURRENT_BINARY_DIR}/deploy/${DEPLOY_NAME}/bundles/${BUNDLE_NAME}.zip
COMMAND ${CMAKE_COMMAND} -E copy ${BUNDLE}