Repository: celix Updated Branches: refs/heads/develop 623d47e9b -> 83018f069
CELIX-401: Fixes an issues with the add_docker command for projects using FindCelix & fixes and incorrect var name in the getting started documentation Project: http://git-wip-us.apache.org/repos/asf/celix/repo Commit: http://git-wip-us.apache.org/repos/asf/celix/commit/83018f06 Tree: http://git-wip-us.apache.org/repos/asf/celix/tree/83018f06 Diff: http://git-wip-us.apache.org/repos/asf/celix/diff/83018f06 Branch: refs/heads/develop Commit: 83018f069500d7eaa761439f8a0453c533ec7612 Parents: 623d47e Author: Pepijn Noltes <[email protected]> Authored: Thu Sep 28 20:53:50 2017 +0200 Committer: Pepijn Noltes <[email protected]> Committed: Thu Sep 28 20:53:50 2017 +0200 ---------------------------------------------------------------------- cmake/cmake_celix/DockerPackaging.cmake | 12 ++++++++++-- documents/getting_started/creating_a_simple_bundle.md | 4 ++-- 2 files changed, 12 insertions(+), 4 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/celix/blob/83018f06/cmake/cmake_celix/DockerPackaging.cmake ---------------------------------------------------------------------- diff --git a/cmake/cmake_celix/DockerPackaging.cmake b/cmake/cmake_celix/DockerPackaging.cmake index 46b3008..f6ce077 100644 --- a/cmake/cmake_celix/DockerPackaging.cmake +++ b/cmake/cmake_celix/DockerPackaging.cmake @@ -119,12 +119,20 @@ function(add_docker) DEPENDS ${TIMESTAMP_FILE} ) + #Setting CELIX_LIB_DIRS, CELIX_BIN_DIR and CELIX_LAUNCHER + if (EXISTS ${CELIX_FRAMEWORK_LIBRARY}) + #CELIX_FRAMEWORK_LIBRARY set by FindCelix.cmake -> Celix Based Project + #CELIX_LAUNCHER is set by FindCelix.cmake + else() + set(CELIX_LAUNCHER "$<TARGET_FILE:celix>") + endif() + #setup dependencies based on timestamp if (DOCKER_CREATE_FS) add_custom_command(OUTPUT "${TIMESTAMP_FILE}" COMMAND ${CMAKE_COMMAND} -E touch ${TIMESTAMP_FILE} COMMAND ${CMAKE_COMMAND} -E make_directory $<TARGET_PROPERTY:${DOCKER_TARGET},DOCKER_LOCATION> - COMMAND cd $<TARGET_PROPERTY:${DOCKER_TARGET},DOCKER_LOCATION> && /bin/bash ${CELIX_CMAKE_DIRECTORY}/cmake_celix/create_target_filesystem.sh -e $<TARGET_FILE:celix> -l $<TARGET_FILE:${DOCKER_DEPSLIB}> + COMMAND cd $<TARGET_PROPERTY:${DOCKER_TARGET},DOCKER_LOCATION> && /bin/bash ${CELIX_CMAKE_DIRECTORY}/cmake_celix/create_target_filesystem.sh -e ${CELIX_LAUNCHER} -l $<TARGET_FILE:${DOCKER_DEPSLIB}> DEPENDS "$<TARGET_PROPERTY:${DOCKER_TARGET},DOCKER_DEPS>" ${DOCKERFILE} ${DOCKER_DEPSLIB} WORKING_DIRECTORY "${DOCKER_LOCATION}" COMMENT "Creating docker dir for ${DOCKER_TARGET}" VERBATIM @@ -286,4 +294,4 @@ function(docker_instructions) endforeach() set_target_properties(${DOCKER_TARGET} PROPERTIES "DOCKER_INSTRUCTIONS" "${INSTRUCTIONS}") -endfunction() \ No newline at end of file +endfunction() http://git-wip-us.apache.org/repos/asf/celix/blob/83018f06/documents/getting_started/creating_a_simple_bundle.md ---------------------------------------------------------------------- diff --git a/documents/getting_started/creating_a_simple_bundle.md b/documents/getting_started/creating_a_simple_bundle.md index 4eefcba..d2f7d11 100644 --- a/documents/getting_started/creating_a_simple_bundle.md +++ b/documents/getting_started/creating_a_simple_bundle.md @@ -117,9 +117,9 @@ add_bundle(HelloWorld ) IF(APPLE) - target_link_libraries(HelloWorld ${CELIX_LIBRARIES} -Wl,-all_load ${CELIX_DM_CXX_STATIC_LIB}) + target_link_libraries(HelloWorld ${CELIX_LIBRARIES} -Wl,-all_load ${CELIX_DM_STATIC_CXX_LIB}) else() - target_link_libraries(HelloWorld -Wl,--no-undefined -Wl,--whole-archive ${CELIX_DM_CXX_STATIC_LIB} -Wl,--no-whole-archive ${CELIX_LIBRARIES}) + target_link_libraries(HelloWorld -Wl,--no-undefined -Wl,--whole-archive ${CELIX_DM_STATIC_CXX_LIB} -Wl,--no-whole-archive ${CELIX_LIBRARIES}) endif() ```
