Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

hotfix/Add project prefix to avoid conflict #617

Merged
merged 1 commit into from
Aug 18, 2023

Conversation

PengZheng
Copy link
Contributor

@PengZheng PengZheng commented Aug 17, 2023

If a downstream project uses CelixConfig.cmake as a template, it might provide a config file like the following:

get_filename_component(REL_INSTALL_DIR "${CMAKE_CURRENT_LIST_FILE}" PATH)
get_filename_component(REL_INSTALL_DIR "${REL_INSTALL_DIR}" PATH)
get_filename_component(REL_INSTALL_DIR "${REL_INSTALL_DIR}" PATH)
get_filename_component(REL_INSTALL_DIR "${REL_INSTALL_DIR}" PATH)

find_dependency(Celix)

include(${REL_INSTALL_DIR}/share/celix/cmake/CelixTargets.cmake)

Then REL_INSTALL_DIR will mess with the one used by CelixConfig.cmake, leading to mysterious errors.
This PR solves this by adding project specific prefix to REL_INSTALL_DIR.

@codecov-commenter
Copy link

Codecov Report

Merging #617 (8e6a786) into master (4c24ebf) will increase coverage by 0.02%.
The diff coverage is n/a.

❗ Current head 8e6a786 differs from pull request most recent head fc022b3. Consider uploading reports for the commit fc022b3 to get more accurate results

@@            Coverage Diff             @@
##           master     #617      +/-   ##
==========================================
+ Coverage   79.72%   79.75%   +0.02%     
==========================================
  Files         259      259              
  Lines       34681    34681              
==========================================
+ Hits        27651    27661      +10     
+ Misses       7030     7020      -10     

see 3 files with indirect coverage changes

📣 We’re building smart automated test selection to slash your CI/CD build times. Learn more

@PengZheng PengZheng merged commit db99d91 into master Aug 18, 2023
22 checks passed
@PengZheng PengZheng deleted the hotfix/avoid-config-conflict branch August 18, 2023 01:39
Copy link
Contributor

@pnoltes pnoltes left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

LGTM

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