Repository: celix Updated Branches: refs/heads/develop 60f327df6 -> 79852c59a
CELIX-438: Updates dm example linkage Project: http://git-wip-us.apache.org/repos/asf/celix/repo Commit: http://git-wip-us.apache.org/repos/asf/celix/commit/79852c59 Tree: http://git-wip-us.apache.org/repos/asf/celix/tree/79852c59 Diff: http://git-wip-us.apache.org/repos/asf/celix/diff/79852c59 Branch: refs/heads/develop Commit: 79852c59ad92fb1f9a1815ffbe34cf180262b77f Parents: 60f327d Author: Pepijn Noltes <[email protected]> Authored: Sun Dec 2 17:15:18 2018 +0100 Committer: Pepijn Noltes <[email protected]> Committed: Sun Dec 2 17:15:18 2018 +0100 ---------------------------------------------------------------------- examples/celix-examples/dm_example/phase1/CMakeLists.txt | 11 ----------- .../celix-examples/dm_example/phase2a/CMakeLists.txt | 11 ----------- .../celix-examples/dm_example/phase2b/CMakeLists.txt | 11 ----------- examples/celix-examples/dm_example/phase3/CMakeLists.txt | 11 ----------- 4 files changed, 44 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/celix/blob/79852c59/examples/celix-examples/dm_example/phase1/CMakeLists.txt ---------------------------------------------------------------------- diff --git a/examples/celix-examples/dm_example/phase1/CMakeLists.txt b/examples/celix-examples/dm_example/phase1/CMakeLists.txt index 09402ea..20c0a37 100644 --- a/examples/celix-examples/dm_example/phase1/CMakeLists.txt +++ b/examples/celix-examples/dm_example/phase1/CMakeLists.txt @@ -25,14 +25,3 @@ add_celix_bundle(dm_example_phase1 ) target_include_directories(dm_example_phase1 PRIVATE src) target_link_libraries(dm_example_phase1 PRIVATE dm_example_api) - -IF(APPLE) - target_link_libraries(dm_example_phase1 PRIVATE -Wl,-all_load Celix::dependency_manager_static) -else() - if(ENABLE_ADDRESS_SANITIZER) - #With asan there can be undefined symbols - target_link_libraries(dm_example_phase1 PRIVATE -Wl,--whole-archive Celix::dependency_manager_static -Wl,--no-whole-archive) - else() - target_link_libraries(dm_example_phase1 PRIVATE -Wl,--no-undefined -Wl,--whole-archive Celix::dependency_manager_static -Wl,--no-whole-archive) - endif() -endif() http://git-wip-us.apache.org/repos/asf/celix/blob/79852c59/examples/celix-examples/dm_example/phase2a/CMakeLists.txt ---------------------------------------------------------------------- diff --git a/examples/celix-examples/dm_example/phase2a/CMakeLists.txt b/examples/celix-examples/dm_example/phase2a/CMakeLists.txt index 82a6fb5..4765d45 100644 --- a/examples/celix-examples/dm_example/phase2a/CMakeLists.txt +++ b/examples/celix-examples/dm_example/phase2a/CMakeLists.txt @@ -24,14 +24,3 @@ add_celix_bundle(dm_example_phase2a ) target_include_directories(dm_example_phase2a PRIVATE src) target_link_libraries(dm_example_phase2a PRIVATE dm_example_api) - -IF(APPLE) - target_link_libraries(dm_example_phase2a PRIVATE -Wl,-all_load Celix::dependency_manager_static) -else() - if(ENABLE_ADDRESS_SANITIZER) - #With asan there can be undefined symbols - target_link_libraries(dm_example_phase2a PRIVATE -Wl,--whole-archive Celix::dependency_manager_static -Wl,--no-whole-archive) - else() - target_link_libraries(dm_example_phase2a PRIVATE -Wl,--no-undefined -Wl,--whole-archive Celix::dependency_manager_static -Wl,--no-whole-archive) - endif() -ENDIF() http://git-wip-us.apache.org/repos/asf/celix/blob/79852c59/examples/celix-examples/dm_example/phase2b/CMakeLists.txt ---------------------------------------------------------------------- diff --git a/examples/celix-examples/dm_example/phase2b/CMakeLists.txt b/examples/celix-examples/dm_example/phase2b/CMakeLists.txt index 9172ad8..31a9ad2 100644 --- a/examples/celix-examples/dm_example/phase2b/CMakeLists.txt +++ b/examples/celix-examples/dm_example/phase2b/CMakeLists.txt @@ -24,14 +24,3 @@ add_celix_bundle(dm_example_phase2b ) target_include_directories(dm_example_phase2b PRIVATE src) target_link_libraries(dm_example_phase2b PRIVATE dm_example_api) - -IF(APPLE) - target_link_libraries(dm_example_phase2b PRIVATE -Wl,-all_load Celix::dependency_manager_static) -else() - if(ENABLE_ADDRESS_SANITIZER) - #With asan there can be undefined symbols - target_link_libraries(dm_example_phase2b PRIVATE -Wl,--whole-archive Celix::dependency_manager_static -Wl,--no-whole-archive) - else() - target_link_libraries(dm_example_phase2b PRIVATE -Wl,--no-undefined -Wl,--whole-archive Celix::dependency_manager_static -Wl,--no-whole-archive) - endif() -ENDIF() http://git-wip-us.apache.org/repos/asf/celix/blob/79852c59/examples/celix-examples/dm_example/phase3/CMakeLists.txt ---------------------------------------------------------------------- diff --git a/examples/celix-examples/dm_example/phase3/CMakeLists.txt b/examples/celix-examples/dm_example/phase3/CMakeLists.txt index 7fae829..feff621 100644 --- a/examples/celix-examples/dm_example/phase3/CMakeLists.txt +++ b/examples/celix-examples/dm_example/phase3/CMakeLists.txt @@ -24,14 +24,3 @@ add_celix_bundle(dm_example_phase3 ) target_include_directories(dm_example_phase3 PRIVATE src) target_link_libraries(dm_example_phase3 PRIVATE dm_example_api) - -IF(APPLE) - target_link_libraries(dm_example_phase3 PRIVATE -Wl,-all_load Celix::dependency_manager_static) -else() - if(ENABLE_ADDRESS_SANITIZER) - #With asan there can be undefined symbols - target_link_libraries(dm_example_phase3 PRIVATE -Wl,--whole-archive Celix::dependency_manager_static -Wl,--no-whole-archive) - else() - target_link_libraries(dm_example_phase3 PRIVATE -Wl,--no-undefined -Wl,--whole-archive Celix::dependency_manager_static -Wl,--no-whole-archive) - endif() -ENDIF()
