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.

Sign up for GitHub

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

Jump to bottom

OpenMP Fix on M1 #1641

Merged
merged 8 commits into from
Mar 28, 2022
Merged

OpenMP Fix on M1 #1641

merged 8 commits into from
Mar 28, 2022

Conversation

dcoeurjo
Copy link
Member

@dcoeurjo dcoeurjo commented Mar 25, 2022 •
edited
Loading

PR Description

your description here

Checklist

  • Unit-test of your feature with Catch.
  • Doxygen documentation of the code completed (classes, methods, types, members...)
  • Documentation module page added or updated.
  • New entry in the ChangeLog.md added.
  • No warning raised in Debug mode.
  • All continuous integration tests pass (Github Actions & appveyor)

@dcoeurjo dcoeurjo requested a review from kerautret March 26, 2022 09:13
kerautret
kerautret approved these changes Mar 26, 2022
View reviewed changes
Copy link
Member

@kerautret kerautret left a comment

Choose a reason for hiding this comment

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

small perhaps indent but fine for me, I am testing on my Mac (not on M1 ;))

cmake/DGtalConfig.cmake.in Outdated
if(APPLE)
message("-- Setting OpenMP flags on MacOs. Assuming `brew install libomp`")
if(CMAKE_C_COMPILER_ID MATCHES "Clang\$")
if(APPLE)
Copy link
Member

Choose a reason for hiding this comment

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

indent as before change ?

@kerautret
Copy link
Member

small perhaps indent but fine for me, I am testing on my Mac (not on M1 ;))

@kerautret
Copy link
Member

Else looks fine on my Intel Mac 👍🏻

@dcoeurjo
Copy link
Member Author

Thx. Updated

@dcoeurjo dcoeurjo merged commit 404a79e into master Mar 28, 2022
@dcoeurjo dcoeurjo deleted the openmpfix branch March 28, 2022 18:50
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@kerautret kerautret kerautret approved these changes

Assignees
No one assigned
Labels
ready for review 👍
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
2 participants
@dcoeurjo @kerautret