diff options
| author | René Meusel <[email protected]> | 2019-05-22 11:47:12 +0200 |
|---|---|---|
| committer | René Meusel <[email protected]> | 2019-05-22 16:22:33 +0200 |
| commit | 41d71a07ef1bb4f1048c7f5c94d3185e091a3724 (patch) | |
| tree | 1704e7178584a36c76e18ed7dc7a1930c08fa3e2 /src/scripts | |
| parent | eeca5e9d2e701d248b01e2c808f35b0d7eb53562 (diff) | |
Let AppVeyor build --with-boost (static libraries)
Diffstat (limited to 'src/scripts')
| -rw-r--r-- | src/scripts/ci/appveyor.yml | 15 | ||||
| -rwxr-xr-x | src/scripts/ci_build.py | 10 |
2 files changed, 25 insertions, 0 deletions
diff --git a/src/scripts/ci/appveyor.yml b/src/scripts/ci/appveyor.yml index 3988522ca..bc9a65d08 100644 --- a/src/scripts/ci/appveyor.yml +++ b/src/scripts/ci/appveyor.yml @@ -14,30 +14,45 @@ environment: PLATFORM: x86 TARGET: shared APPVEYOR_BUILD_WORKER_IMAGE: Visual Studio 2015 + BOOST_ROOT: "C:\\Libraries\\boost_1_69_0" + BOOST_LIBRARYDIR: "C:\\Libraries\\boost_1_69_0\\lib32-msvc-14.0" + BOOST_SYSTEM_LIBRARY: "libboost_system-vc140-mt-x32-1_69.lib" # MSVC 2015 DLL x86-64 - MSVS: 2015 PLATFORM: x86_amd64 TARGET: shared APPVEYOR_BUILD_WORKER_IMAGE: Visual Studio 2015 + BOOST_ROOT: "C:\\Libraries\\boost_1_69_0" + BOOST_LIBRARYDIR: "C:\\Libraries\\boost_1_69_0\\lib64-msvc-14.0" + BOOST_SYSTEM_LIBRARY: "libboost_system-vc140-mt-x64-1_69.lib" # MSVC 2017 DLL x86-32 - MSVS: 2017 PLATFORM: x86 TARGET: shared APPVEYOR_BUILD_WORKER_IMAGE: Visual Studio 2017 + BOOST_ROOT: "C:\\Libraries\\boost_1_69_0" + BOOST_LIBRARYDIR: "C:\\Libraries\\boost_1_69_0\\lib32-msvc-14.1" + BOOST_SYSTEM_LIBRARY: "libboost_system-vc141-mt-x32-1_69.lib" # MSVC 2017 DLL x86-64 - MSVS: 2017 PLATFORM: x86_amd64 TARGET: shared APPVEYOR_BUILD_WORKER_IMAGE: Visual Studio 2017 + BOOST_ROOT: "C:\\Libraries\\boost_1_69_0" + BOOST_LIBRARYDIR: "C:\\Libraries\\boost_1_69_0\\lib64-msvc-14.1" + BOOST_SYSTEM_LIBRARY: "libboost_system-vc141-mt-x64-1_69.lib" # MSVC 2017 static x86-64 - MSVS: 2017 PLATFORM: x86_amd64 TARGET: static APPVEYOR_BUILD_WORKER_IMAGE: Visual Studio 2017 + BOOST_ROOT: "C:\\Libraries\\boost_1_69_0" + BOOST_LIBRARYDIR: "C:\\Libraries\\boost_1_69_0\\lib64-msvc-14.1" + BOOST_SYSTEM_LIBRARY: "libboost_system-vc141-mt-x64-1_69.lib" # MSVC 2019 x86-64 w/debug iterators - MSVS: 2019 diff --git a/src/scripts/ci_build.py b/src/scripts/ci_build.py index 257cc8827..e00b219f6 100755 --- a/src/scripts/ci_build.py +++ b/src/scripts/ci_build.py @@ -202,6 +202,16 @@ def determine_flags(target, target_os, target_cpu, target_cc, cc_bin, ccache, ro if target_os == 'osx' or target == 'coverage': flags += ['--with-boost'] + if target_os == 'windows' and target in ['shared', 'static']: + # ./configure.py needs extra hand-holding for boost on windows + boost_root = os.environ['BOOST_ROOT'] + boost_libs = os.environ['BOOST_LIBRARYDIR'] + boost_system = os.environ['BOOST_SYSTEM_LIBRARY'] + flags += ['--with-boost', + '--with-external-includedir', boost_root, + '--with-external-libdir', boost_libs, + '--boost-library-name', boost_system] + if target_os == 'linux': flags += ['--with-lzma'] |