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
[SofaExporter] FIX: out-of-tree include of SofaExporter header files #975
Merged
damienmarchal
merged 12 commits into
sofa-framework:master
from
SofaDefrost:fix_SofaExporter_includes
Apr 27, 2019
Merged
Changes from 4 commits
Commits
Show all changes
12 commits
Select commit
Hold shift + click to select a range
2150bb7
[SofaExporter] FIX: out-of-tree include of SofaExporter header files
marques-bruno 91633dd
Merge branch 'master' into fix_SofaExporter_includes
marques-bruno d75b237
[CImgPlugin][SofaExporter] FIX: include export in targets
marques-bruno c008496
[CImgPlugin_test] RESTORING erased CMakeLists.txt...
marques-bruno fc19fec
FIX: INCLUDE_SOURCE_DIR in CImgPlugin
marques-bruno c93eca4
[CImgPlugin] REMOVE ../ from include dirs
marques-bruno 205a024
[CImgPlugin] Reverting last commit
marques-bruno 962dc8b
Removing deprecated CImg includes dirs
marques-bruno 47e0e96
[CImgPlugin] CLEAN include directories for build interface
guparan 3ca2ff3
[CImgPlugin] FIX wrong include relative paths
guparan b7eccba
[CImgPlugin] setting ImageCImg.h from system to local include
marques-bruno b254ccc
Merge branch 'fix_SofaExporter_includes' of github.com:SofaDefrost/so…
marques-bruno File filter
Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
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
Original file line number | Diff line number | Diff line change |
---|---|---|
|
@@ -8,4 +8,6 @@ if(NOT TARGET SofaExporter) | |
include("${CMAKE_CURRENT_LIST_DIR}/SofaExporterTargets.cmake") | ||
endif() | ||
|
||
# set(@PROJECT_NAME@_INCLUDE_DIRS @CMAKE_CURRENT_SOURCE_DIR@/src/) | ||
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. commented ? |
||
|
||
check_required_components(SofaExporter) |
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.
Not sure this is needed.
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.
I think it kind of is:
There's .h & .cpp files present directly in CImgPlugin dir, so if, from external code, you want to include CImgPlugin.h for instance, by typing:
#include <CImgPlugin/CImgPlugin.h>
you'd have to include ../ no?