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

Added cmake switch to disable usage of OpenMP #53

Merged
merged 1 commit into from
Aug 3, 2016
Merged

Added cmake switch to disable usage of OpenMP #53

merged 1 commit into from
Aug 3, 2016

Conversation

HannesSommer
Copy link
Collaborator

No description provided.

@pomerlef
Copy link
Collaborator

Looks good to me

simonlynen
simonlynen reviewed Aug 1, 2016
View reviewed changes
CMakeLists.txt
endif(OPENMP_FOUND)
set(USE_OPEN_MP "true" CACHE BOOL "Set to OFF to not use OpenMP")
if(USE_OPEN_MP)
find_package(OpenMP)
Copy link
Collaborator

Choose a reason for hiding this comment

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

please make the indentation consistent with the rest of the file. (2 space indent)

@simonlynen
Copy link
Collaborator

apart from indentation, lgtm.

@HannesSommer HannesSommer force-pushed the feature/openMpCmakeSwitch branch 2 times, most recently from 7281236 to 0d89dc7 Compare August 1, 2016 09:11
@HannesSommer
Copy link
Collaborator Author

Thanks for the feedback. I've made the block I touched as consistent with the rest as I could think of.

The sad truth is that regarding white-spaces this file is already in a nightmare like state :).

So the question is what is the underlying rule for this project?
A language ignorant statistics on the files there is a clear majority in favour for tab indentation. Which also fits the personal preference of the main author, @stephanemagnenat , IMO. So I guess it was originally planned to be tab intended. This also fits with the output of git blame for this very file the older parts are tab indented.

I'd suggest to merge this as is and have a follow up issue clarifying things and fixing existing indentation.
I've opened issue #54.

@HannesSommer HannesSommer force-pushed the feature/openMpCmakeSwitch branch from 0d89dc7 to b5006b0 Compare August 3, 2016 09:09
@HannesSommer HannesSommer merged commit b1ac136 into master Aug 3, 2016
@HannesSommer HannesSommer deleted the feature/openMpCmakeSwitch branch August 3, 2016 09:36
@HannesSommer HannesSommer restored the feature/openMpCmakeSwitch branch September 7, 2017 13:40
@HannesSommer HannesSommer deleted the feature/openMpCmakeSwitch branch September 7, 2017 13:40
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers
No reviews
Assignees
No one assigned
Labels
None yet
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
3 participants
@HannesSommer @pomerlef @simonlynen