Skip to content
GitLab
Menu
Projects
Groups
Snippets
Loading...
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
Menu
Open sidebar
gaoqiong
pybind11
Commits
f7abac66
Unverified
Commit
f7abac66
authored
Aug 12, 2020
by
Henry Schreiner
Committed by
GitHub
Aug 12, 2020
Browse files
fix: boost's include dir was listed first (#2384)
parent
17320463
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
3 additions
and
3 deletions
+3
-3
tests/CMakeLists.txt
tests/CMakeLists.txt
+2
-2
tests/test_embed/CMakeLists.txt
tests/test_embed/CMakeLists.txt
+1
-1
No files found.
tests/CMakeLists.txt
View file @
f7abac66
...
@@ -236,13 +236,13 @@ foreach(target ${test_targets})
...
@@ -236,13 +236,13 @@ foreach(target ${test_targets})
if
(
PYBIND11_EIGEN_VIA_TARGET
)
if
(
PYBIND11_EIGEN_VIA_TARGET
)
target_link_libraries
(
${
target
}
PRIVATE Eigen3::Eigen
)
target_link_libraries
(
${
target
}
PRIVATE Eigen3::Eigen
)
else
()
else
()
target_include_directories
(
${
target
}
PRIVATE
${
EIGEN3_INCLUDE_DIR
}
)
target_include_directories
(
${
target
}
SYSTEM
PRIVATE
${
EIGEN3_INCLUDE_DIR
}
)
endif
()
endif
()
target_compile_definitions
(
${
target
}
PRIVATE -DPYBIND11_TEST_EIGEN
)
target_compile_definitions
(
${
target
}
PRIVATE -DPYBIND11_TEST_EIGEN
)
endif
()
endif
()
if
(
Boost_FOUND
)
if
(
Boost_FOUND
)
target_include_directories
(
${
target
}
PRIVATE
${
Boost_INCLUDE_DIRS
}
)
target_include_directories
(
${
target
}
SYSTEM
PRIVATE
${
Boost_INCLUDE_DIRS
}
)
target_compile_definitions
(
${
target
}
PRIVATE -DPYBIND11_TEST_BOOST
)
target_compile_definitions
(
${
target
}
PRIVATE -DPYBIND11_TEST_BOOST
)
endif
()
endif
()
...
...
tests/test_embed/CMakeLists.txt
View file @
f7abac66
...
@@ -14,7 +14,7 @@ else()
...
@@ -14,7 +14,7 @@ else()
endif
()
endif
()
add_executable
(
test_embed catch.cpp test_interpreter.cpp
)
add_executable
(
test_embed catch.cpp test_interpreter.cpp
)
target_include_directories
(
test_embed PRIVATE
"
${
CATCH_INCLUDE_DIR
}
"
)
target_include_directories
(
test_embed
SYSTEM
PRIVATE
"
${
CATCH_INCLUDE_DIR
}
"
)
pybind11_enable_warnings
(
test_embed
)
pybind11_enable_warnings
(
test_embed
)
target_link_libraries
(
test_embed PRIVATE pybind11::embed
)
target_link_libraries
(
test_embed PRIVATE pybind11::embed
)
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
.
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment