Skip to content

Refactors generation and usage of CelixTargets cmake files#254

Merged
pnoltes merged 3 commits intomasterfrom
feature/single_bundle_targets_entry_point
Jun 11, 2020
Merged

Refactors generation and usage of CelixTargets cmake files#254
pnoltes merged 3 commits intomasterfrom
feature/single_bundle_targets_entry_point

Conversation

@pnoltes
Copy link
Copy Markdown
Contributor

@pnoltes pnoltes commented Jun 8, 2020

Changes how CelixTargets cmake file are generated and used for installs with multiple build types.

Primary so that there is can be a single CelixTargets.cmake entry point.
Tthis is needed to not break how Celix (or projects export Celix bundles) Config.cmake file works.

I ran into the issue that all project using Celix, exporting bundles and providing a Config.cmake are not building any more.

In the refactored setup, there is always a CelixTargets.cmake file and this file includes all config specific CelixTargets-.cmake files.

Also ensure that multiple imported bundle configs can coexists. When creating a container/docker the correct bundle for the config will be resolved. I tried to mimic as much as possible cmake behavior for imported library targets.

This resolving also make use of CMAKE_MAP_IMPORTED_CONFIG_ and target properties MAP_IMPORTED_CONFIG_ (if present)

I ensured that it will always try to resolve to a imported bundle targets even if no imported bundle target exists for the build type and no MAP_IMPORT_CONFIG exists. If I am not sure how CMake handle this for libraries, but this seems logical for me...

I tested this when installed for the CMAKE_BUILD_TYPE Release, Debug and using the celix-example dir (which can be build standalone).

@pnoltes pnoltes requested a review from abroekhuis June 8, 2020 19:36
@codecov-commenter
Copy link
Copy Markdown

codecov-commenter commented Jun 8, 2020

Codecov Report

Merging #254 into master will increase coverage by 0.44%.
The diff coverage is n/a.

Impacted file tree graph

@@            Coverage Diff             @@
##           master     #254      +/-   ##
==========================================
+ Coverage   67.83%   68.27%   +0.44%     
==========================================
  Files         127      127              
  Lines       26375    26894     +519     
==========================================
+ Hits        17891    18363     +472     
- Misses       8484     8531      +47     
Impacted Files Coverage Δ
...b/pubsub_admin_tcp/src/pubsub_tcp_topic_receiver.c 67.67% <0.00%> (+4.55%) ⬆️
...sub/pubsub_admin_tcp/src/pubsub_tcp_topic_sender.c 69.64% <0.00%> (+5.53%) ⬆️
...s/pubsub/pubsub_admin_tcp/src/pubsub_tcp_handler.c 82.00% <0.00%> (+5.79%) ⬆️

Continue to review full report at Codecov.

Legend - Click here to learn more
Δ = absolute <relative> (impact), ø = not affected, ? = missing data
Powered by Codecov. Last update e288834...d974ebb. Read the comment docs.

@pnoltes pnoltes merged commit 67dfb18 into master Jun 11, 2020
@pnoltes pnoltes deleted the feature/single_bundle_targets_entry_point branch June 11, 2020 10:59
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

3 participants