-
Notifications
You must be signed in to change notification settings - Fork 311
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
[cmake] Remove the use of an internal Eigen3 version and instead use the one installed on the system. #1281
Merged
guparan
merged 9 commits into
sofa-framework:master
from
jnbrunet:remove_eigen_from_within_sofa
Apr 3, 2020
Merged
Changes from all commits
Commits
Show all changes
9 commits
Select commit
Hold shift + click to select a range
2ea4fb0
Remove the use of an internal Eigen3 version and instead
jnbrunet 3600ca0
[Compliant] Fix wrong memcpy for Eigen > 3.2 where the outer indices …
jnbrunet e89591f
[SofaSimpleGui] FIX CMake error
guparan 1e88c3f
[cmake] Cleanups of some CMake files relative to the exclusion of Eig…
jnbrunet e7de4eb
[SofaEigen2Solver] FIX dep macro naming
guparan a9df959
[SofaEigen2Solver] FIX dep macro naming (2)
guparan 9076524
[SofaEigen2Solver] Use cmakedefine instead of cmakedefine01
jnbrunet b09f03b
[SofaEigen2Solver] Now use cmakedefine01 and #if instead of #ifdef pr…
jnbrunet 6c611d7
[CGALPlugin] Reset the old FindCGAL.cmake
jnbrunet File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file was deleted.
Oops, something went wrong.
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Oops, something went wrong.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Without the
else
, if you decide to disableSOFA_OPENMP
after having it enabled, you will still haveSOFAEIGEN2SOLVER_HAVE_OPENMP = 1
in CMake cache.There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Not if
#cmakedefine
is used instead of#cmakedefine01
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Sorry, I've misread you.
SOFAEIGEN2SOLVER_HAVE_OPENMP
isn't a cmake cached variable. It is unset at the beginning of each cmake call. I've tested it:There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Indeed, thanks for the tests 👍
What happens if
#cmakedefine01
is used instead?There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
OFF :
#define SOFAEIGEN2SOLVER_HAVE_OPENMP 0
ON :
#define SOFAEIGEN2SOLVER_HAVE_OPENMP 1
OFF :
#define SOFAEIGEN2SOLVER_HAVE_OPENMP 0
and in cpp files,
#ifdef SOFAEIGEN2SOLVER_HAVE_OPENMP
will always be true since it is always definedThere was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Yes because the idea behind
#cmakedefine01
is to permit the usage of#if
andif()
.#ifdef
surely becomes useless though.