Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

CI: Windows vcpkg build tests #324

Merged
merged 1 commit into from
Sep 28, 2024
+7 −2
Merged

CI: Windows vcpkg build tests #324

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion .github/workflows/winvcpkg.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
5 changes: 5 additions & 0 deletions CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion cmake/bins.cmake
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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()
Expand Down
Loading