Skip to content

CMake: allow use of installed dependencies, take 2 #337

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

Merged
merged 3 commits into from
Aug 8, 2024
Merged

CMake: allow use of installed dependencies, take 2 #337

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
bbed9bd
CMake: allow use of installed pybind11
nim65s Jun 26, 2024
9dfef3a
CMake: modernize cereal use
nim65s Jun 26, 2024
b0e626c
changelog: sync
nim65s Jun 26, 2024
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 CHANGELOG.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/).
## [Unreleased]

### Added
* Allow use of installed cereal and jrl-cmakemodules via cmake
* Allow use of installed pybind11, cereal and jrl-cmakemodules via cmake
* Add compatibility with jrl-cmakemodules workspace ([#339](https://github.com/Simple-Robotics/proxsuite/pull/339))
* Specifically mention that timings are in microseconds ([#340](https://github.com/Simple-Robotics/proxsuite/pull/340))
* Fix cereal include directory in cmake ([#340](https://github.com/Simple-Robotics/proxsuite/pull/340))
Expand Down
12 changes: 7 additions & 5 deletions bindings/python/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,9 +14,12 @@ else()
${CMAKE_INSTALL_PREFIX}/${PYTHON_SITELIB}/${PROJECT_NAME})
endif()

file(MAKE_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}/external/pybind11)
add_subdirectory(external/pybind11
${CMAKE_CURRENT_BINARY_DIR}/external/pybind11)
find_package(pybind11 CONFIG)
if(NOT pybind11_FOUND)
file(MAKE_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}/external/pybind11)
add_subdirectory(external/pybind11
${CMAKE_CURRENT_BINARY_DIR}/external/pybind11)
endif()

add_custom_target(${PROJECT_NAME}_python)

Expand Down Expand Up @@ -92,8 +95,7 @@ function(CREATE_PYTHON_TARGET target_name COMPILE_OPTIONS dependencies)
endif(BUILD_WITH_OPENMP_SUPPORT)

if(cereal_FOUND)
target_include_directories(${target_name} SYSTEM
PRIVATE ${CEREAL_INCLUDE_DIRS})
target_link_libraries(${target_name} PRIVATE cereal::cereal)
else()
target_include_directories(
${target_name} SYSTEM
Expand Down