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

Generalise RTools config/support #777

Merged
merged 10 commits into from Jun 26, 2023
Merged

Generalise RTools config/support #777

merged 10 commits into from Jun 26, 2023

Conversation

andrjohns
Copy link
Collaborator

Submission Checklist

  • Run unit tests
  • Declare copyright holder and agree to license (see below)

Summary

This PR makes our handling of different RTools versions a little more flexible, and reduce some of the hard-coded handling of different versions.

I've also updated the CXXFLAGS for the MSVCRT setting handling to:

        "CXXFLAGS += -Wno-nonnull -D_UCRT",
        "TBB_CXXFLAGS= -D_UCRT"

Which enables the missing definitions

Copyright and Licensing

Please list the copyright holder for the work you are submitting
(this will be you or your assignee, such as a university or company):
Andrew Johnson

By submitting this pull request, the copyright holder is agreeing to
license the submitted work under the following licenses:

Copy link
Member

@rok-cesnovar rok-cesnovar left a comment

Choose a reason for hiding this comment

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

Fantastic. Assuming the tests go green now with master merged in, this is good to be merged.

@codecov-commenter
Copy link

Codecov Report

Merging #777 (d50ab95) into master (5f61efe) will increase coverage by 0.27%.
The diff coverage is 48.48%.

❗ Current head d50ab95 differs from pull request most recent head 3b2aeca. Consider uploading reports for the commit 3b2aeca to get more accurate results

@@            Coverage Diff             @@
##           master     #777      +/-   ##
==========================================
+ Coverage   86.22%   86.50%   +0.27%     
==========================================
  Files          12       12              
  Lines        4130     4134       +4     
==========================================
+ Hits         3561     3576      +15     
+ Misses        569      558      -11     
Impacted Files Coverage Δ
R/install.R 55.41% <46.87%> (+3.34%) ⬆️
R/utils.R 71.78% <100.00%> (-0.57%) ⬇️

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

@rok-cesnovar rok-cesnovar merged commit 337ed08 into master Jun 26, 2023
11 checks passed
@rok-cesnovar rok-cesnovar deleted the rtools-compat-fixes branch June 26, 2023 10:29
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.

None yet

3 participants