diff options
| -rw-r--r-- | appveyor.yml | 17 | ||||
| -rw-r--r-- | cmake/examples/boost/CMakeLists.txt | 2 |
2 files changed, 14 insertions, 5 deletions
diff --git a/appveyor.yml b/appveyor.yml index 1a8b1e3..262086c 100644 --- a/appveyor.yml +++ b/appveyor.yml @@ -30,13 +30,22 @@ build_script: - C:\install\dynamic\bin\foo.exe - ps: .\.ci\verify_arch.ps1 -Path C:\install\dynamic\bin\foo.exe -Arch x64 - - '"%python_exe%" ./boost/build/build.py download 1.58.0' - - '"%python_exe%" ./boost/build/build.py download --cache . 1.72.0' - - - '"%python_exe%" ./boost/build/build.py build --configuration Debug --platform x86 -- ./boost_1_58_0 --with-filesystem --with-program_options' + - echo Boost 1.58.0 + - '"%python_exe%" ./boost/build/build.py download 1.58.0' + - '"%python_exe%" ./boost/build/build.py build --configuration Debug --platform x86 --link static -- ./boost_1_58_0 runtime-link=static --with-filesystem --with-program_options' - dir /a-D /S /B boost_1_58_0\stage + - '"%python_exe%" ./cmake/build/build.py --install C:\install\boost_1_58_0 --configuration Debug -- cmake/examples/boost -A Win32 -D "BOOST_ROOT=%APPVEYOR_BUILD_FOLDER%\boost_1_58_0" -D "BOOST_LIBRARYDIR=%APPVEYOR_BUILD_FOLDER%\boost_1_58_0\stage\x86\lib"' + - C:\install\boost_1_58_0\bin\foo.exe + - ps: .\.ci\verify_arch.ps1 -Path C:\install\boost_1_58_0\bin\foo.exe -Arch x86 + + - echo Boost 1.72.0 + - '"%python_exe%" ./boost/build/build.py download --cache . 1.72.0' - '"%python_exe%" ./boost/build/build.py build --configuration Debug Release --platform x86 x64 --link shared -- ./boost_1_72_0 --with-filesystem --with-program_options' - dir /a-D /S /B boost_1_72_0\stage + - '"%python_exe%" ./cmake/build/build.py --install C:\install\boost_1_72_0 --configuration Release -- cmake/examples/boost -A x64 -D "BOOST_ROOT=%APPVEYOR_BUILD_FOLDER%\boost_1_72_0" -D "BOOST_LIBRARYDIR=%APPVEYOR_BUILD_FOLDER%\boost_1_72_0\stage\x64\lib" -D Boost_USE_STATIC_LIBS=OFF -D CC_STATIC_RUNTIME=OFF' + - set "PATH=%APPVEYOR_BUILD_FOLDER%\boost_1_72_0\stage\x64\lib;%PATH%" && C:\install\boost_1_72_0\bin\foo.exe + - 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' - dir /a-D /S /B C:\boost_1_65_0\stage diff --git a/cmake/examples/boost/CMakeLists.txt b/cmake/examples/boost/CMakeLists.txt index 87fcc4e..b73fcee 100644 --- a/cmake/examples/boost/CMakeLists.txt +++ b/cmake/examples/boost/CMakeLists.txt @@ -6,6 +6,6 @@ include(../../common.cmake) find_package(Boost REQUIRED COMPONENTS filesystem) add_executable(foo foo.cpp) -target_link_libraries(foo PRIVATE Boost::filesystem) +target_link_libraries(foo PRIVATE Boost::disable_autolinking Boost::filesystem) install(TARGETS foo RUNTIME DESTINATION bin) |