Skip to content

Commit

Permalink
Clean up CI and CMake from Boost.Test and Boost.System remains
Browse files Browse the repository at this point in the history
Follow-up to boostorg#459 and boostorg#464
  • Loading branch information
mloskot committed Mar 24, 2020
1 parent 70ff564 commit 3c00586
Show file tree
Hide file tree
Showing 5 changed files with 8 additions and 16 deletions.
2 changes: 1 addition & 1 deletion .appveyor.yml
Original file line number Diff line number Diff line change
Expand Up @@ -95,7 +95,7 @@ before_build:
- cd boost-root
- cmd /c bootstrap
- .\b2 headers > NUL
- if DEFINED GENERATOR .\b2 address-model=%AM% toolset=%TOOLSET% variant=%VARIANT% cxxstd=%CXXSTD% --with-filesystem --with-test stage
- if DEFINED GENERATOR .\b2 address-model=%AM% toolset=%TOOLSET% variant=%VARIANT% cxxstd=%CXXSTD% --with-filesystem stage

build: off

Expand Down
4 changes: 2 additions & 2 deletions .ci/azure-pipelines/steps-install-boost.yml
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,7 @@ steps:
cd boost-root
./bootstrap.sh
sudo ./b2 headers
sudo ./b2 -j4 toolset=${{ parameters.toolset }} variant=${{ parameters.variant }} --with-filesystem --with-system --with-test stage
sudo ./b2 -j4 toolset=${{ parameters.toolset }} variant=${{ parameters.variant }} --with-filesystem stage
ls stage/lib
displayName: 'Install Boost on Unix'
condition: ne(variables['Agent.OS'], 'Windows_NT')
Expand All @@ -35,7 +35,7 @@ steps:
cd boost-root
call .\bootstrap.bat
.\b2 headers
.\b2 -j4 address-model=32 variant=${{ parameters.variant }} --layout=system --with-filesystem --with-system --with-test stage
.\b2 -j4 address-model=32 variant=${{ parameters.variant }} --layout=system --with-filesystem stage
dir stage\lib
displayName: 'Install Boost on Windows'
condition: eq(variables['Agent.OS'], 'Windows_NT')
2 changes: 0 additions & 2 deletions .ci/get-boost.sh
Original file line number Diff line number Diff line change
Expand Up @@ -46,7 +46,6 @@ git submodule --quiet update --init $GIT_SUBMODULE_OPTS \
libs/mpl \
libs/numeric/conversion \
libs/preprocessor \
libs/test \
libs/type_traits \
libs/variant
# Transitive (of GIL tests too)
Expand Down Expand Up @@ -75,7 +74,6 @@ git submodule --quiet update --init $GIT_SUBMODULE_OPTS \
libs/regex \
libs/static_assert \
libs/smart_ptr \
libs/system \
libs/throw_exception \
libs/timer \
libs/tuple \
Expand Down
10 changes: 2 additions & 8 deletions CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -103,17 +103,11 @@ if("${CMAKE_CXX_COMPILER_ID}" STREQUAL "MSVC")
set(Boost_USE_STATIC_RUNTIME OFF)
endif()

find_package(Boost 1.72.0 REQUIRED
COMPONENTS
filesystem
unit_test_framework)
find_package(Boost 1.72.0 REQUIRED COMPONENTS filesystem)
message(STATUS "Boost.GIL: Using Boost_INCLUDE_DIRS=${Boost_INCLUDE_DIRS}")
message(STATUS "Boost.GIL: Using Boost_LIBRARY_DIRS=${Boost_LIBRARY_DIRS}")

target_link_libraries(gil_dependencies
INTERFACE
Boost::filesystem
Boost::unit_test_framework)
target_link_libraries(gil_dependencies INTERFACE Boost::filesystem)

if("${CMAKE_CXX_COMPILER_ID}" STREQUAL "MSVC")
target_link_libraries(gil_dependencies INTERFACE Boost::disable_autolinking)
Expand Down
6 changes: 3 additions & 3 deletions CONTRIBUTING.md
Original file line number Diff line number Diff line change
Expand Up @@ -405,13 +405,13 @@ which is used to run GIL tests. Since the `CMAKE_CXX_STANDARD` option in the cur

```shell
./b2 headers
./b2 variant=debug,release cxxstd=11 --with-test --with-filesystem stage
./b2 variant=debug,release cxxstd=11 --with-filesystem stage
```

or, depending on specific requirements, more complete build:

```shell
./b2 variant=debug,release address-model=32,64 cxxstd=11 --layout=versioned --with-test --with-filesystem stage
./b2 variant=debug,release address-model=32,64 cxxstd=11 --layout=versioned --with-filesystem stage
```

If you wish to build tests using different C++ standard version, then adjust the `cxxstd` accordingly.
Expand Down Expand Up @@ -461,7 +461,7 @@ Here is an example of such lightweight workflow in Linux environment (Debian-bas
The option added in CMake 3.13.0.
- option `-DBoost_COMPILER=-gcc5` or `-DBoost_COMPILER=-vc141` to help CMake earlier
than 3.13 match your compiler with toolset used in the Boost library file names
(i.e. `libboost_unit_test_framework-gcc5-mt-x64-1_69` and not `-gcc55-`).
(i.e. `libboost_filesystem-gcc5-mt-x64-1_69` and not `-gcc55-`).
Fixed in CMake 3.13.0.
- if CMake is still failing to find Boost, you may try `-DBoost_DEBUG=ON` to
get detailed diagnostics output from `FindBoost.cmake` module.
Expand Down

0 comments on commit 3c00586

Please sign in to comment.