Skip to content
Open
Show file tree
Hide file tree
Changes from 3 commits
Commits
Show all changes
55 commits
Select commit Hold shift + click to select a range
c52aa46
use osx sysroot
maddanio Jan 6, 2021
8ab8918
use requests instead of urlopen to avoid 403
maddanio Jan 6, 2021
7c11f74
use requests instead of urlopen to avoid 403
maddanio Jan 6, 2021
0051c34
drop dead import
maddanio Jan 7, 2021
70e0574
drop ssl import
maddanio Jan 7, 2021
fa9af07
use click progressbar
maddanio Jan 7, 2021
a619e89
Merge branch 'master' into nourlopen
maddanio Jan 7, 2021
0a69079
handle download error
maddanio Jan 7, 2021
21cd83a
dont use global include dir
maddanio Jan 8, 2021
9e9c919
implement simple package hashing
maddanio Jan 8, 2021
37a64d2
implement simple package hashing
maddanio Jan 8, 2021
c004339
zip builds to cache
maddanio Jan 8, 2021
c18ce38
Merge branch 'build_cache' into master
maddanio Jan 8, 2021
8dcd3ab
Revert "dont use global include dir"
maddanio Jan 11, 2021
4048bcf
make global include dir optional
maddanio Jan 11, 2021
dcb990f
add dirhash dependency
maddanio Jan 11, 2021
4366aff
add dirhash dependency
maddanio Jan 11, 2021
0ddf426
get builds from cache if possible
maddanio Jan 11, 2021
90015b2
lock cache
maddanio Jan 11, 2021
0d0d854
Merge branch 'build_cache' into master
maddanio Jan 11, 2021
41bd679
make build cache optional
maddanio Jan 11, 2021
674f357
Merge branch 'build_cache' into master
maddanio Jan 11, 2021
b14ce52
Merge remote-tracking branch 'origin/isolation' into master
maddanio Jan 11, 2021
4478066
propagate build cache setting to dependencies
maddanio Jan 11, 2021
936ca1e
Merge branch 'build_cache' into master
maddanio Jan 11, 2021
e5021aa
allow fast path cached builds by ignoring in source deps
maddanio Jan 11, 2021
3d2fcd1
Merge branch 'build_cache' into master
maddanio Jan 11, 2021
7e17de7
preserve recipe in package source for hashing
maddanio Jan 12, 2021
72c0eaf
prevent cache access from crashing
maddanio Jan 12, 2021
4247383
show non matching hash value
maddanio Jan 12, 2021
dfc28db
add option to autotools.cmake to run autogen.sh
maddanio Jan 12, 2021
12becfb
add optional boost bootstrap args
maddanio Jan 13, 2021
887b08d
stable setting of python exe for boost
maddanio Jan 14, 2021
b03e046
preserve file permissions in unzip
maddanio Jan 14, 2021
c60ca42
fix python syntax
maddanio Jan 14, 2021
7011815
fix boost.cmake
maddanio Jan 14, 2021
8ee6cf4
support cmake < 3.19
maddanio Jan 14, 2021
e723cf0
fix boost python discovery
maddanio Jan 14, 2021
a41cd2c
find python by absolute path for boost
maddanio Jan 14, 2021
1679edc
use top level bootstrap in boost.cmake
maddanio Jan 14, 2021
750aab1
dont overwrite linker flags repeatedly
maddanio Jan 15, 2021
de35535
remove debug log
maddanio Jan 18, 2021
3bd0bed
move debug out to log
maddanio Jan 18, 2021
5e754d2
double python hint for boost on osx
maddanio Jan 18, 2021
4929807
emit final boost user-config
maddanio Jan 18, 2021
acf16d5
dont put space after -L
maddanio Jan 18, 2021
8fc1c29
fix build cache
maddanio Jan 22, 2021
bd0d22a
use full python path for bjam
maddanio Jan 22, 2021
bce0429
avoid package fetch if possible
maddanio Jan 22, 2021
a7c6fd5
fix uninitialized variable
maddanio Jan 22, 2021
8245bea
reduce meddling of build drivers with pkg config
maddanio Jan 22, 2021
7a4db1f
isolate packages
maddanio Jan 26, 2021
c58aaa2
actually return dependents
maddanio Jan 26, 2021
aed37d1
pass src dir to get_dependents
maddanio Jan 26, 2021
9a57805
fix defines passign
maddanio Jan 26, 2021
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
7 changes: 5 additions & 2 deletions cget/cli.py
Original file line number Diff line number Diff line change
Expand Up @@ -56,7 +56,8 @@ def w(obj, prefix, verbose, build_path, *args, **kwargs):
@click.option('-D', '--define', multiple=True, help="Extra configuration variables to pass to CMake")
@click.option('--shared', is_flag=True, help="Set toolchain to build shared libraries by default")
@click.option('--static', is_flag=True, help="Set toolchain to build static libraries by default")
def init_command(prefix, toolchain, cc, cxx, cflags, cxxflags, ldflags, std, define, shared, static):
@click.option('--no-global-include', is_flag=True, help="Don't use global include dir (required for -X header)")
Copy link
Owner

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?

def init_command(prefix, toolchain, cc, cxx, cflags, cxxflags, ldflags, std, define, shared, static, no_global_include):
""" Initialize install directory """
if shared and static:
click.echo("ERROR: shared and static are not supported together")
Expand All @@ -73,7 +74,9 @@ def init_command(prefix, toolchain, cc, cxx, cflags, cxxflags, ldflags, std, def
cxxflags=cxxflags,
ldflags=ldflags,
std=std,
defines=defines)
defines=defines,
no_global_include=no_global_include
)

@cli.command(name='install')
@use_prefix
Expand Down
26 changes: 19 additions & 7 deletions cget/prefix.py
Original file line number Diff line number Diff line change
Expand Up @@ -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)
Copy link
Owner

Choose a reason for hiding this comment

The 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)
Expand Down