-
Notifications
You must be signed in to change notification settings - Fork 27
dont use global include dir #89
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
Open
maddanio
wants to merge
55
commits into
pfultz2:master
Choose a base branch
from
pixelwise:isolation
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
Changes from 3 commits
Commits
Show all changes
55 commits
Select commit
Hold shift + click to select a range
c52aa46
use osx sysroot
maddanio 8ab8918
use requests instead of urlopen to avoid 403
maddanio 7c11f74
use requests instead of urlopen to avoid 403
maddanio 0051c34
drop dead import
maddanio 70e0574
drop ssl import
maddanio fa9af07
use click progressbar
maddanio a619e89
Merge branch 'master' into nourlopen
maddanio 0a69079
handle download error
maddanio 21cd83a
dont use global include dir
maddanio 9e9c919
implement simple package hashing
maddanio 37a64d2
implement simple package hashing
maddanio c004339
zip builds to cache
maddanio c18ce38
Merge branch 'build_cache' into master
maddanio 8dcd3ab
Revert "dont use global include dir"
maddanio 4048bcf
make global include dir optional
maddanio dcb990f
add dirhash dependency
maddanio 4366aff
add dirhash dependency
maddanio 0ddf426
get builds from cache if possible
maddanio 90015b2
lock cache
maddanio 0d0d854
Merge branch 'build_cache' into master
maddanio 41bd679
make build cache optional
maddanio 674f357
Merge branch 'build_cache' into master
maddanio b14ce52
Merge remote-tracking branch 'origin/isolation' into master
maddanio 4478066
propagate build cache setting to dependencies
maddanio 936ca1e
Merge branch 'build_cache' into master
maddanio e5021aa
allow fast path cached builds by ignoring in source deps
maddanio 3d2fcd1
Merge branch 'build_cache' into master
maddanio 7e17de7
preserve recipe in package source for hashing
maddanio 72c0eaf
prevent cache access from crashing
maddanio 4247383
show non matching hash value
maddanio dfc28db
add option to autotools.cmake to run autogen.sh
maddanio 12becfb
add optional boost bootstrap args
maddanio 887b08d
stable setting of python exe for boost
maddanio b03e046
preserve file permissions in unzip
maddanio c60ca42
fix python syntax
maddanio 7011815
fix boost.cmake
maddanio 8ee6cf4
support cmake < 3.19
maddanio e723cf0
fix boost python discovery
maddanio a41cd2c
find python by absolute path for boost
maddanio 1679edc
use top level bootstrap in boost.cmake
maddanio 750aab1
dont overwrite linker flags repeatedly
maddanio de35535
remove debug log
maddanio 3bd0bed
move debug out to log
maddanio 5e754d2
double python hint for boost on osx
maddanio 4929807
emit final boost user-config
maddanio acf16d5
dont put space after -L
maddanio 8fc1c29
fix build cache
maddanio bd0d22a
use full python path for bjam
maddanio bce0429
avoid package fetch if possible
maddanio a7c6fd5
fix uninitialized variable
maddanio 8245bea
reduce meddling of build drivers with pkg config
maddanio 7a4db1f
isolate packages
maddanio c58aaa2
actually return dependents
maddanio aed37d1
pass src dir to get_dependents
maddanio 9a57805
fix defines passign
maddanio 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 hidden or 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 hidden or 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 |
|---|---|---|
|
|
@@ -117,20 +117,32 @@ def write_cmake(self, always_write=False, **kwargs): | |
|
|
||
| @returns(inspect.isgenerator) | ||
| @util.yield_from | ||
| def generate_cmake_toolchain(self, toolchain=None, cc=None, cxx=None, cflags=None, cxxflags=None, ldflags=None, std=None, defines=None): | ||
| def generate_cmake_toolchain( | ||
| self, | ||
| toolchain=None, | ||
| cc=None, | ||
| cxx=None, | ||
| cflags=None, | ||
| cxxflags=None, | ||
| ldflags=None, | ||
| std=None, | ||
| defines=None, | ||
| no_global_include=False | ||
| ): | ||
| set_ = cmake_set | ||
| if_ = cmake_if | ||
| else_ = cmake_else | ||
| append_ = cmake_append | ||
| yield set_('CGET_PREFIX', self.prefix) | ||
| yield set_('CMAKE_PREFIX_PATH', self.prefix) | ||
|
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. Extending the CMAKE_PREFIX_PATH should not be removed. |
||
| yield if_('${CMAKE_VERSION} VERSION_LESS "3.6.0"', | ||
| ['include_directories(SYSTEM ${CGET_PREFIX}/include)'], | ||
| else_( | ||
| set_('CMAKE_CXX_STANDARD_INCLUDE_DIRECTORIES', '${CGET_PREFIX}/include'), | ||
| set_('CMAKE_C_STANDARD_INCLUDE_DIRECTORIES', '${CGET_PREFIX}/include') | ||
| if not no_global_include: | ||
| yield if_('${CMAKE_VERSION} VERSION_LESS "3.6.0"', | ||
| ['include_directories(SYSTEM ${CGET_PREFIX}/include)'], | ||
| else_( | ||
| set_('CMAKE_CXX_STANDARD_INCLUDE_DIRECTORIES', '${CGET_PREFIX}/include'), | ||
| set_('CMAKE_C_STANDARD_INCLUDE_DIRECTORIES', '${CGET_PREFIX}/include') | ||
| ) | ||
| ) | ||
| ) | ||
| if toolchain: yield ['include({})'.format(util.quote(os.path.abspath(toolchain)))] | ||
| yield if_('CMAKE_CROSSCOMPILING', | ||
| append_('CMAKE_FIND_ROOT_PATH', self.prefix) | ||
|
|
||
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.
How about naming this
--disable-global-include?