Return-Path: X-Original-To: apmail-celix-commits-archive@www.apache.org Delivered-To: apmail-celix-commits-archive@www.apache.org Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) by minotaur.apache.org (Postfix) with SMTP id AA8901880E for ; Wed, 3 Feb 2016 08:41:17 +0000 (UTC) Received: (qmail 84051 invoked by uid 500); 3 Feb 2016 08:41:14 -0000 Delivered-To: apmail-celix-commits-archive@celix.apache.org Received: (qmail 84026 invoked by uid 500); 3 Feb 2016 08:41:14 -0000 Mailing-List: contact commits-help@celix.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: dev@celix.apache.org Delivered-To: mailing list commits@celix.apache.org Received: (qmail 84017 invoked by uid 99); 3 Feb 2016 08:41:14 -0000 Received: from git1-us-west.apache.org (HELO git1-us-west.apache.org) (140.211.11.23) by apache.org (qpsmtpd/0.29) with ESMTP; Wed, 03 Feb 2016 08:41:14 +0000 Received: by git1-us-west.apache.org (ASF Mail Server at git1-us-west.apache.org, from userid 33) id 7948FDFC8F; Wed, 3 Feb 2016 08:41:14 +0000 (UTC) Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit From: pnoltes@apache.org To: commits@celix.apache.org Message-Id: <79ee042f00f54d309263dc58a186bb8f@git.apache.org> X-Mailer: ASF-Git Admin Mailer Subject: celix git commit: CELIX-335: Move deploy timestamp file to CMAKE_CURRENT_BINARY_DIR. Update run.sh to reuse existing (DY)LD_LIBRARY_PATH Date: Wed, 3 Feb 2016 08:41:14 +0000 (UTC) Repository: celix Updated Branches: refs/heads/feature/CELIX-335_deploy_refactoring edf549c01 -> 89eaab323 CELIX-335: Move deploy timestamp file to CMAKE_CURRENT_BINARY_DIR. Update run.sh to reuse existing (DY)LD_LIBRARY_PATH Project: http://git-wip-us.apache.org/repos/asf/celix/repo Commit: http://git-wip-us.apache.org/repos/asf/celix/commit/89eaab32 Tree: http://git-wip-us.apache.org/repos/asf/celix/tree/89eaab32 Diff: http://git-wip-us.apache.org/repos/asf/celix/diff/89eaab32 Branch: refs/heads/feature/CELIX-335_deploy_refactoring Commit: 89eaab3239545f22c66ded58af8f176a686f0246 Parents: edf549c Author: Pepijn Noltes Authored: Wed Feb 3 09:40:00 2016 +0100 Committer: Pepijn Noltes Committed: Wed Feb 3 09:40:00 2016 +0100 ---------------------------------------------------------------------- cmake/cmake_celix/Packaging.cmake | 12 +++++++----- 1 file changed, 7 insertions(+), 5 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/celix/blob/89eaab32/cmake/cmake_celix/Packaging.cmake ---------------------------------------------------------------------- diff --git a/cmake/cmake_celix/Packaging.cmake b/cmake/cmake_celix/Packaging.cmake index bde696b..3fcf070 100644 --- a/cmake/cmake_celix/Packaging.cmake +++ b/cmake/cmake_celix/Packaging.cmake @@ -464,13 +464,15 @@ function(add_deploy) ###### Setup deploy custom target and config.properties file + set(TIMESTAMP_FILE "${CMAKE_CURRENT_BINARY_DIR}/${DEPLOY_TARGET}-timestamp") + add_custom_target(${DEPLOY_TARGET} - DEPENDS "${DEPLOY_LOCATION}/timestamp" + DEPENDS ${TIMESTAMP_FILE} ) add_dependencies(deploy ${DEPLOY_TARGET}) - add_custom_command(OUTPUT ${DEPLOY_LOCATION}/timestamp - COMMAND ${CMAKE_COMMAND} -E touch ${DEPLOY_LOCATION}/timestamp + add_custom_command(OUTPUT "${TIMESTAMP_FILE}" + COMMAND ${CMAKE_COMMAND} -E touch ${TIMESTAMP_FILE} DEPENDS "$" "${DEPLOY_LOCATION}/config.properties" "${DEPLOY_LOCATION}/run.sh" WORKING_DIRECTORY "${DEPLOY_LOCATION}" COMMENT "Deploying ${DEPLOY_PRINT_NAME}" VERBATIM @@ -501,14 +503,14 @@ $, if(APPLE) file(GENERATE OUTPUT ${DEPLOY_LOCATION}/run.sh - CONTENT "export DYLD_LIBRARY_PATH=$:$:$ + CONTENT "export DYLD_LIBRARY_PATH=$:$:$:\${DYLD_LIBRARY_PATH} $ $@ " ) else() file(GENERATE OUTPUT ${DEPLOY_LOCATION}/run.sh - CONTENT "export LD_LIBRARY_PATH=$:$:$ + CONTENT "export LD_LIBRARY_PATH=$:$:$:\${LD_LIBRARY_PATH} $ $@ " )