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 2016/02/05 12:00:30 UTC
[11/42] celix git commit: CELIX-335: Fix issue in deploy_bundles_dir
dependencies setup. Now 'make -j' and ninja works
CELIX-335: Fix issue in deploy_bundles_dir dependencies setup. Now 'make -j' and ninja works
Project: http://git-wip-us.apache.org/repos/asf/celix/repo
Commit: http://git-wip-us.apache.org/repos/asf/celix/commit/919a3eb5
Tree: http://git-wip-us.apache.org/repos/asf/celix/tree/919a3eb5
Diff: http://git-wip-us.apache.org/repos/asf/celix/diff/919a3eb5
Branch: refs/heads/develop
Commit: 919a3eb505d90b3afe8762de071a47624b71755b
Parents: 6acd0b9
Author: Pepijn Noltes <pe...@gmail.com>
Authored: Fri Jan 8 10:56:00 2016 +0100
Committer: Pepijn Noltes <pe...@gmail.com>
Committed: Fri Jan 8 10:56:00 2016 +0100
----------------------------------------------------------------------
.travis.yml | 4 ++--
cmake/cmake_celix/Packaging.cmake | 3 +--
2 files changed, 3 insertions(+), 4 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/celix/blob/919a3eb5/.travis.yml
----------------------------------------------------------------------
diff --git a/.travis.yml b/.travis.yml
index 22e77b0..40155d7 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -3,10 +3,10 @@ language: c
matrix:
include:
- os: linux
- dist: trustry
+ dist: trusty
compiler: gcc
- os: linux
- dist: trustry
+ dist: trusty
compiler: clang
- os: osx
compiler: gcc
http://git-wip-us.apache.org/repos/asf/celix/blob/919a3eb5/cmake/cmake_celix/Packaging.cmake
----------------------------------------------------------------------
diff --git a/cmake/cmake_celix/Packaging.cmake b/cmake/cmake_celix/Packaging.cmake
index bb7daa9..534a2a8 100644
--- a/cmake/cmake_celix/Packaging.cmake
+++ b/cmake/cmake_celix/Packaging.cmake
@@ -538,8 +538,7 @@ function(deploy_bundles_dir)
else()
add_custom_command(OUTPUT ${OUT}
COMMAND ${CMAKE_COMMAND} -E copy_if_different "$<TARGET_PROPERTY:${BUNDLE},BUNDLE_FILE>" ${OUT}
- DEPENDS ${BUNDLE}
- #DEPENDS "$<TARGET_PROPERTY:${BUNDLE},BUNDLE_FILE>"
+ DEPENDS ${BUNDLE}_bundle
)
endif()
endforeach()