diff --git a/.github/workflows/winvcpkg.yml b/.github/workflows/winvcpkg.yml index b29cc8fe4..a616ecc6e 100644 --- a/.github/workflows/winvcpkg.yml +++ b/.github/workflows/winvcpkg.yml @@ -46,7 +46,7 @@ jobs: vcpkgJsonGlob: '**/vcpkg.json' - name: Configure CMake - run: cmake -B ${{github.workspace}}/build -G Ninja -DCMAKE_TOOLCHAIN_FILE=${{github.workspace}}/vcpkg/scripts/buildsystems/vcpkg.cmake || cmake -B ${{github.workspace}}/build -G Ninja -DCMAKE_TOOLCHAIN_FILE=${{github.workspace}}/vcpkg/scripts/buildsystems/vcpkg.cmake -DOPENMIND_BUILD_TESTS=NO + run: cmake -B ${{github.workspace}}/build -G Ninja -DCMAKE_TOOLCHAIN_FILE=${{github.workspace}}/vcpkg/scripts/buildsystems/vcpkg.cmake || cmake -B ${{github.workspace}}/build -G Ninja -DCMAKE_TOOLCHAIN_FILE=${{github.workspace}}/vcpkg/scripts/buildsystems/vcpkg.cmake -DOPENMIND_BUILD_TESTS=ON - name: Build run: cmake --build ${{github.workspace}}/build diff --git a/CMakeLists.txt b/CMakeLists.txt index 3766fea6f..b4950b9b9 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -190,6 +190,11 @@ set(_BOOST_USED_COMPONENTS thread CACHE STRING "Components" FORCE) if(OPENMIND_USE_VCPKG) +# set(Boost_USE_STATIC_LIBS ON) +# set(Boost_USE_DEBUG_LIBS OFF) +# set(Boost_USE_RELEASE_LIBS ON) +# set(Boost_USE_MULTITHREADED ON) +# set(Boost_USE_STATIC_RUNTIME ON) set(_BOOST_USED_COMPONENTS ${_BOOST_USED_COMPONENTS} compute multiprecision diff --git a/cmake/bins.cmake b/cmake/bins.cmake index 70ac7ecd1..180c18ff2 100644 --- a/cmake/bins.cmake +++ b/cmake/bins.cmake @@ -240,7 +240,7 @@ function(test) message("test_libs ${test_libs}") set(libs ${test_libs} ${TEST_DEPS})#pthread if(Boost_FOUND) - if(NOT MSVC OR OPENMIND_USE_CONAN) + if(NOT MSVC OR OPENMIND_USE_CONAN OR OPENMIND_USE_VCPKG) set(libs ${libs} ${BOOST_TEST_LINK_LIBS}) endif() endif()