CELIX-377: Adds work around for Android issue with libcelix_dfi
Project: http://git-wip-us.apache.org/repos/asf/celix/repo Commit: http://git-wip-us.apache.org/repos/asf/celix/commit/525dc872 Tree: http://git-wip-us.apache.org/repos/asf/celix/tree/525dc872 Diff: http://git-wip-us.apache.org/repos/asf/celix/diff/525dc872 Branch: refs/heads/master Commit: 525dc87252474d80ca1c761768ef5569e87d9043 Parents: 1379a35 Author: Pepijn Noltes <[email protected]> Authored: Fri Oct 7 17:20:06 2016 +0200 Committer: Pepijn Noltes <[email protected]> Committed: Fri Oct 7 17:20:06 2016 +0200 ---------------------------------------------------------------------- launcher/CMakeLists.txt | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/celix/blob/525dc872/launcher/CMakeLists.txt ---------------------------------------------------------------------- diff --git a/launcher/CMakeLists.txt b/launcher/CMakeLists.txt index 4f9056a..920d4c0 100644 --- a/launcher/CMakeLists.txt +++ b/launcher/CMakeLists.txt @@ -27,7 +27,9 @@ if (LAUNCHER) set_target_properties(celix PROPERTIES "INSTALL_RPATH" "${CMAKE_INSTALL_PREFIX}/${CMAKE_INSTALL_LIBDIR}") target_link_libraries(celix celix_framework ${CURL_LIBRARIES}) - target_link_libraries(celix celix_dfi) #note not strictly needed, but ensure libdfi is a dep for the framework, useful when create docker images + if (NOT ANDROID) + target_link_libraries(celix celix_dfi) #note not strictly needed, but ensure libdfi is a dep for the framework, useful when create docker images + endif() include_directories("${PROJECT_SOURCE_DIR}/utils/public/include") include_directories("${PROJECT_SOURCE_DIR}/framework/public/include")
