Skip to content

Commit

Permalink
Changed Boost_Find / COMPONENTS option to be more general.
Browse files Browse the repository at this point in the history
  • Loading branch information
jgaa committed Aug 11, 2024
1 parent c1b7890 commit 2a965a5
Show file tree
Hide file tree
Showing 2 changed files with 3 additions and 3 deletions.
2 changes: 1 addition & 1 deletion .github/workflows/ci.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -81,7 +81,7 @@ jobs:
mkdir build
fi
pushd build
cmake .. -DMYSQLPOOL_WITH_TESTS=ON -DMYSQLPOOL_WITH_INTGRATION_TESTS=OFF -DMYSQLPOOL_WITH_EXAMPLES=ON -DCMAKE_BUILD_TYPE=Release -G "Ninja" -DCMAKE_TOOLCHAIN_FILE=~/vcpkg/scripts/buildsystems/vcpkg.cmake
cmake .. -DMYSQLPOOL_BOOST_ALL=OFF -DMYSQLPOOL_WITH_TESTS=ON -DMYSQLPOOL_WITH_INTGRATION_TESTS=OFF -DMYSQLPOOL_WITH_EXAMPLES=ON -DCMAKE_BUILD_TYPE=Release -G "Ninja" -DCMAKE_TOOLCHAIN_FILE=~/vcpkg/scripts/buildsystems/vcpkg.cmake
cmake --build .
popd
Expand Down
4 changes: 2 additions & 2 deletions CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@ option(MYSQLPOOL_WITH_TESTS "Enable Tests" OFF)
option(MYSQLPOOL_WITH_INTGRATION_TESTS "Enable Integretion Tests" OFF)
option(MYSQLPOOL_WITH_EXAMPLES "Compile examples" OFF)
option(MYSQLPOOL_EMBEDDED "Do not try to install dependencies" OFF)
option(MYSQLPOOL_BOOST_FROM_CONAN "Find_Boost supplied with the Boost Conan package is messed up and don't support COMPONENT" OFF)
option(MYSQLPOOL_BOOST_ALL "Find_Boost support COMPONENT" ON)

set(MYSQLPOOL_LOGGER "clog" CACHE STRING "Log system to use. One of 'clog', 'internal', 'logfault', 'boost' or 'none'")
set(MYSQLPOOL_LOG_LEVEL_STR "info" CACHE STRING "Minimum log level to enable. One of 'none', error', 'warn', 'info', 'debug', 'trace'")
Expand Down Expand Up @@ -119,7 +119,7 @@ if(NOT DEFINED USE_BOOST_VERSION)
set(USE_BOOST_VERSION 1.83)
endif()

if (NOT MYSQLPOOL_BOOST_FROM_CONAN)
if (MYSQLPOOL_BOOST_ALL)
set(BOOST_ALL "ALL")
endif()

Expand Down

0 comments on commit 2a965a5

Please sign in to comment.