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

CPack Update #693

Merged
merged 5 commits into from
Jan 18, 2022
Merged

CPack Update #693

merged 5 commits into from
Jan 18, 2022

Conversation

marip8
Copy link
Contributor

@marip8 marip8 commented Jan 4, 2022

This PR fixes a few issues with the CPack configurations:

Debian dependencies

Currently the dependencies of a package are passed into the tesseract_cpack macro as a list of strings. cmake concatenates these entries into a semi-colon separated string. This is problematic for debians because they expect a comma-separated list of dependencies. I think NuGet packages have the same requirement, but I was not able to confirm. The solution was to replace the semi-colons in ${ARG_<OS>_DEPENDS} with commas

Debian architecture name

The debians I initially created would not install because the specified architecture x86_64 did not match the system architecture amd64. The specified architecture currently comes from the CMAKE_SYSTEM_PROCESSOR variable, which returns x86_64 in my case. Per this document, x86_64 is not actually a valid debian architecture; the corresponding architecture should actually be amd64. The solution was to change references from x86_64 to amd64 for Linux builds. I'm not sure if Windows NuGet packages are affected the same way, so I didn't change anything there

@codecov
Copy link

codecov bot commented Jan 5, 2022

Codecov Report

Merging #693 (498836d) into master (ab607da) will not change coverage.
The diff coverage is n/a.

❗ Current head 498836d differs from pull request most recent head 7f3dad6. Consider uploading reports for the commit 7f3dad6 to get more accurate results
Impacted file tree graph

@@           Coverage Diff           @@
##           master     #693   +/-   ##
=======================================
  Coverage   92.16%   92.16%           
=======================================
  Files         172      172           
  Lines       11017    11017           
=======================================
  Hits        10154    10154           
  Misses        863      863           
Impacted Files Coverage Δ
tesseract_environment/src/environment.cpp 91.74% <0.00%> (ø)

@Levi-Armstrong
Copy link
Contributor

Levi-Armstrong commented Jan 18, 2022

@marip8 Is it okay to merge this if CI passes?

@marip8
Copy link
Contributor Author

marip8 commented Jan 18, 2022

Yes, I've run it locally and been able to produce debians

@Levi-Armstrong Levi-Armstrong merged commit 414749e into tesseract-robotics:master Jan 18, 2022
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.

2 participants