aboutsummaryrefslogtreecommitdiffstatshomepage
diff options
context:
space:
mode:
-rw-r--r--.travis.yml9
-rw-r--r--appveyor.yml13
-rwxr-xr-xcmake/build/ci/appveyor.py9
-rwxr-xr-xcmake/build/ci/travis.py13
4 files changed, 36 insertions, 8 deletions
diff --git a/.travis.yml b/.travis.yml
index b7ce789..56abeba 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -90,6 +90,15 @@ jobs:
script:
- ./boost/build/ci/travis.py --link static -- --with-filesystem --with-program_options
- bash -o pipefail -c 'find "$HOME/boost_1_65_0/stage" -type f | sort'
+ - >-
+ TRAVIS_BUILD_DIR="$TRAVIS_BUILD_DIR/cmake/examples/boost"
+ ./cmake/build/ci/travis.py
+ --install "$HOME/install/boost_1_65_0"
+ --
+ -D BOOST_ROOT="$HOME/boost_1_65_0"
+ -D BOOST_LIBRARYDIR="$HOME/boost_1_65_0/stage/x64/Release/lib"
+ - "$HOME/install/boost_1_65_0/bin/foo"
+ - ./.ci/verify_arch.sh "$HOME/install/boost_1_65_0/bin/foo" x64
env:
travis_boost_version: 1.65.0
configuration: Release
diff --git a/appveyor.yml b/appveyor.yml
index c95a9c1..3218224 100644
--- a/appveyor.yml
+++ b/appveyor.yml
@@ -95,5 +95,16 @@ build_script:
- ps: .\.ci\verify_arch.ps1 -Path C:\install\boost_1_72_0\bin\foo.exe -Arch x64
- echo Boost 1.65.0
- - '"%python_exe%" ./boost/build/ci/appveyor.py --link static -- --with-filesystem --with-program_options'
+
+ - '"%python_exe%" ./boost/build/ci/appveyor.py --link static -- runtime-link=static --with-filesystem --with-program_options'
- dir /a-D /S /B C:\boost_1_65_0\stage
+
+ - >-
+ set "APPVEYOR_BUILD_FOLDER=%APPVEYOR_BUILD_FOLDER%\cmake\examples\boost" &&
+ "%python_exe%" ./cmake/build/ci/appveyor.py
+ --install C:\install\boost_1_65_0
+ --
+ -D BOOST_ROOT=C:\boost_1_65_0
+ -D BOOST_LIBRARYDIR=C:\boost_1_65_0\stage\x64\lib
+ - C:\install\boost_1_65_0\bin\foo.exe
+ - ps: .\.ci\verify_arch.ps1 -Path C:\install\boost_1_65_0\bin\foo.exe -Arch x64
diff --git a/cmake/build/ci/appveyor.py b/cmake/build/ci/appveyor.py
index 38d0d7e..bb4d31d 100755
--- a/cmake/build/ci/appveyor.py
+++ b/cmake/build/ci/appveyor.py
@@ -15,8 +15,6 @@ import logging
import os
import sys
-from build import build
-
class Image(Enum):
VS_2013 = 'Visual Studio 2013'
@@ -127,8 +125,12 @@ def build_appveyor(argv=None):
args = _parse_args(argv)
_check_appveyor()
+ this_module_dir = os.path.dirname(os.path.abspath(__file__))
+ parent_module_dir = os.path.dirname(this_module_dir)
+ sys.path.insert(1, parent_module_dir)
+ from build import build
+
appveyor_argv = [
- '--src', _get_src_dir(),
'--build', _get_build_dir(),
'--configuration', _get_configuration(),
]
@@ -138,6 +140,7 @@ def build_appveyor(argv=None):
]
appveyor_argv += [
'--',
+ _get_src_dir(),
'-G', _get_generator(),
'-A', _get_platform(),
]
diff --git a/cmake/build/ci/travis.py b/cmake/build/ci/travis.py
index 25dbe70..3712bf9 100755
--- a/cmake/build/ci/travis.py
+++ b/cmake/build/ci/travis.py
@@ -15,8 +15,6 @@ import os
import os.path
import sys
-from build import build
-
def _env(name):
if name not in os.environ:
@@ -64,8 +62,12 @@ def build_travis(argv=None):
args = _parse_args(argv)
_check_travis()
+ this_module_dir = os.path.dirname(os.path.abspath(__file__))
+ parent_module_dir = os.path.dirname(this_module_dir)
+ sys.path.insert(1, parent_module_dir)
+ from build import build
+
travis_argv = [
- '--src', _get_src_dir(),
'--build', _get_build_dir(),
'--configuration', _get_configuration(),
]
@@ -73,7 +75,10 @@ def build_travis(argv=None):
travis_argv += [
'--install', args.install_dir,
]
- travis_argv.append('--')
+ travis_argv += [
+ '--',
+ _get_src_dir(),
+ ]
build(travis_argv + args.cmake_args)