-
Notifications
You must be signed in to change notification settings - Fork 1
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
Use the CMake INTERFACE_INCLUDE_DIRECTORIES feature #15
Open
chrisemblhh
wants to merge
38
commits into
emblsaxs:master
Choose a base branch
from
chrisemblhh:interface_include_directories
base: master
Could not load branches
Branch not found: {{ refName }}
Loading
Could not load tags
Nothing to show
Loading
Are you sure you want to change the base?
Some commits from the old base branch may be removed from the timeline,
and old review comments may become outdated.
Open
Use the CMake INTERFACE_INCLUDE_DIRECTORIES feature #15
chrisemblhh
wants to merge
38
commits into
emblsaxs:master
from
chrisemblhh:interface_include_directories
Conversation
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
INTERFACE_INCLUDE_DIRECTORIES and related commands were first added in CMake 2.8.11
... because of target_include_directories on libsaxsdocument
Don't call include_directories() for libraries which have INTERFACE_INCLUDE_DIRECTORIES set
Don't call include_directories() for libraries which have INTERFACE_INCLUDE_DIRECTORIES set
Conflicts: libsaxsdocument/python/CMakeLists.txt libsaxsdocument/python/ChangeLog
Merging this will depend on having a sufficiently new CMake installed on all the build machines |
Ensuring proper include_directories for h5zlz4
Also needed to update the CMakeLists for fsaxsdocument itself, to account for CMAKE_Fortran_MODULE_DIRECTORY not being set
A recent update to the Travis-CI allowed packages means that now I can require gfortran to be installed for the Trusty CI build.
Presumably you have dropped support for Ubuntu 12.04 and older by now, so this can be merged. |
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
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.
Requires CMake >= 2.8.11
Libraries can be tagged with the header file directories required to use them. This avoids having to manage the header file directories manually.