Skip to content

Commit 6f0b0a1

Browse files
authored
Merge pull request #44 from jorisv/devel
Use VS2022 in CI
2 parents 43c5b53 + c2a0a4a commit 6f0b0a1

3 files changed

Lines changed: 11 additions & 6 deletions

File tree

‎.github/workflows/ci-windows.yml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@ jobs:
1515
strategy:
1616
fail-fast: false
1717
matrix:
18-
os: [windows-latest]
18+
os: [windows-2022]
1919
compiler:
2020
- name: cl
2121
cmd: cl

‎.github/workflows/conda/conda-env.yml‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,7 @@ channels:
44
dependencies:
55
- libboost-devel
66
- libboost-python-devel
7+
- eigen
78
- eigenpy
89
- python
910
- cppad

‎CMakeLists.txt‎

Lines changed: 9 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -118,8 +118,8 @@ TARGET_LINK_BOOST_PYTHON(${PROJECT_NAME} PUBLIC)
118118
TARGET_LINK_LIBRARIES(${PROJECT_NAME} PUBLIC ${cppad_LIBRARY} eigenpy::eigenpy)
119119
IF(BUILD_WITH_CPPAD_CODEGEN_BINDINGS)
120120
TARGET_INCLUDE_DIRECTORIES(${PROJECT_NAME}
121-
SYSTEM PUBLIC
122-
${cppadcg_INCLUDE_DIR}
121+
SYSTEM INTERFACE
122+
$<BUILD_INTERFACE:${cppadcg_INCLUDE_DIR}>
123123
)
124124
TARGET_LINK_LIBRARIES(${PROJECT_NAME} PUBLIC ${CMAKE_DL_LIBS})
125125
ENDIF(BUILD_WITH_CPPAD_CODEGEN_BINDINGS)
@@ -140,11 +140,15 @@ IF(WIN32)
140140
ENDIF(WIN32)
141141

142142
TARGET_INCLUDE_DIRECTORIES(${PROJECT_NAME}
143-
SYSTEM PUBLIC
143+
SYSTEM PRIVATE
144144
${Boost_INCLUDE_DIRS}
145145
${EIGEN3_INCLUDE_DIR}
146-
${PYTHON_INCLUDE_DIRS}
147-
$<INSTALL_INTERFACE:include>)
146+
${PYTHON_INCLUDE_DIR}
147+
)
148+
TARGET_INCLUDE_DIRECTORIES(${PROJECT_NAME}
149+
PUBLIC
150+
$<INSTALL_INTERFACE:include>
151+
)
148152
TARGET_INCLUDE_DIRECTORIES(${PROJECT_NAME} PUBLIC $<INSTALL_INTERFACE:include>)
149153

150154
INSTALL(TARGETS ${PROJECT_NAME}

0 commit comments

Comments
 (0)