Skip to content

Commit

Permalink
- build against mason packages for all deps
Browse files Browse the repository at this point in the history
- use C++14 until mapbox/spatial-algorithms/pull/13 lands
  • Loading branch information
Dane Springmeyer committed Oct 16, 2017
1 parent dbc5790 commit 7f695aa
Show file tree
Hide file tree
Showing 4 changed files with 8 additions and 9 deletions.
6 changes: 2 additions & 4 deletions binding.gyp
Original file line number Diff line number Diff line change
Expand Up @@ -8,9 +8,7 @@
# cflags (linux) and xcode (mac)
'system_includes': [
"-isystem <(module_root_dir)/<!(node -e \"require('nan')\")",
"-isystem <(module_root_dir)/mason_packages/.link/include/",
"-isystem <(module_root_dir)/../vtzero/include",
"-isystem <(module_root_dir)/../protozero/include"
"-isystem <(module_root_dir)/mason_packages/.link/include/"
],
'compiler_checks': [
'-Wall',
Expand Down Expand Up @@ -92,7 +90,7 @@
'GCC_ENABLE_CPP_EXCEPTIONS': 'YES',
'MACOSX_DEPLOYMENT_TARGET':'10.8',
'CLANG_CXX_LIBRARY': 'libc++',
'CLANG_CXX_LANGUAGE_STANDARD':'c++11',
'CLANG_CXX_LANGUAGE_STANDARD':'c++14',
'GCC_VERSION': 'com.apple.compilers.llvm.clang.1_0'
}
}
Expand Down
2 changes: 1 addition & 1 deletion common.gypi
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
'target_defaults': {
'default_configuration': 'Release',
'cflags_cc' : [
'-std=c++11',
'-std=c++14',
# The assumption is that projects based on node-cpp-skel will also
# depend on mason packages. Currently (this will change in future mason versions)
# mason packages default to being built/linked with the CXX11_ABI=0.
Expand Down
7 changes: 4 additions & 3 deletions scripts/install_deps.sh
Original file line number Diff line number Diff line change
Expand Up @@ -14,6 +14,7 @@ source local.env

install geometry 0.9.2
install variant 1.1.4
# install vtzero ...
# install protozero ...
# install spatial-algorithms ...
install vtzero 556fac5
install protozero ccf6c39
install spatial-algorithms 2904283
install boost 1.65.1
2 changes: 1 addition & 1 deletion scripts/setup.sh
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
set -eu
set -o pipefail

export MASON_RELEASE="${MASON_RELEASE:-v0.14.1}"
export MASON_RELEASE="${MASON_RELEASE:-469edc8}"
export MASON_LLVM_RELEASE="${MASON_LLVM_RELEASE:-4.0.1}"

PLATFORM=$(uname | tr A-Z a-z)
Expand Down

0 comments on commit 7f695aa

Please sign in to comment.