From 525a9d2dbf7b974d78f9e657e4a47c6db32821cd Mon Sep 17 00:00:00 2001 From: Joris Vaillant Date: Wed, 10 Jun 2026 11:08:20 +0200 Subject: [PATCH 1/2] ci: Use image with vs2022 --- .github/workflows/ci-windows.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/ci-windows.yml b/.github/workflows/ci-windows.yml index 0ba9ea4..9906d1c 100644 --- a/.github/workflows/ci-windows.yml +++ b/.github/workflows/ci-windows.yml @@ -15,7 +15,7 @@ jobs: strategy: fail-fast: false matrix: - os: [windows-latest] + os: [windows-2022] compiler: - name: cl cmd: cl From c2a0a4a5d7b078876ae9f0d7b0917e26f283f972 Mon Sep 17 00:00:00 2001 From: Joris Vaillant Date: Wed, 10 Jun 2026 11:33:34 +0200 Subject: [PATCH 2/2] ci: Fix build --- .github/workflows/conda/conda-env.yml | 1 + CMakeLists.txt | 14 +++++++++----- 2 files changed, 10 insertions(+), 5 deletions(-) diff --git a/.github/workflows/conda/conda-env.yml b/.github/workflows/conda/conda-env.yml index 5a8ad82..ccdbce8 100644 --- a/.github/workflows/conda/conda-env.yml +++ b/.github/workflows/conda/conda-env.yml @@ -4,6 +4,7 @@ channels: dependencies: - libboost-devel - libboost-python-devel + - eigen - eigenpy - python - cppad diff --git a/CMakeLists.txt b/CMakeLists.txt index 07f0d47..da5664f 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -118,8 +118,8 @@ TARGET_LINK_BOOST_PYTHON(${PROJECT_NAME} PUBLIC) TARGET_LINK_LIBRARIES(${PROJECT_NAME} PUBLIC ${cppad_LIBRARY} eigenpy::eigenpy) IF(BUILD_WITH_CPPAD_CODEGEN_BINDINGS) TARGET_INCLUDE_DIRECTORIES(${PROJECT_NAME} - SYSTEM PUBLIC - ${cppadcg_INCLUDE_DIR} + SYSTEM INTERFACE + $ ) TARGET_LINK_LIBRARIES(${PROJECT_NAME} PUBLIC ${CMAKE_DL_LIBS}) ENDIF(BUILD_WITH_CPPAD_CODEGEN_BINDINGS) @@ -140,11 +140,15 @@ IF(WIN32) ENDIF(WIN32) TARGET_INCLUDE_DIRECTORIES(${PROJECT_NAME} - SYSTEM PUBLIC + SYSTEM PRIVATE ${Boost_INCLUDE_DIRS} ${EIGEN3_INCLUDE_DIR} - ${PYTHON_INCLUDE_DIRS} - $) + ${PYTHON_INCLUDE_DIR} +) +TARGET_INCLUDE_DIRECTORIES(${PROJECT_NAME} + PUBLIC + $ +) TARGET_INCLUDE_DIRECTORIES(${PROJECT_NAME} PUBLIC $) INSTALL(TARGETS ${PROJECT_NAME}