Skip to content

Commit

Permalink
Merge pull request #34 from open-dynamic-robot-initiative/fkloss/pybi…
Browse files Browse the repository at this point in the history
…nd11

find pybind11 before ament_cmake to fix error on Ubuntu 22.04
  • Loading branch information
luator authored Aug 23, 2023
2 parents 9920907 + ac19568 commit 9ad0434
Show file tree
Hide file tree
Showing 3 changed files with 15 additions and 7 deletions.
10 changes: 4 additions & 6 deletions .github/workflows/pr_todo_checks.yml
Original file line number Diff line number Diff line change
Expand Up @@ -7,10 +7,9 @@ jobs:
name: New FIXMEs
runs-on: ubuntu-latest
steps:
- uses: actions/checkout@v2
- run: git fetch origin ${GITHUB_BASE_REF}
- uses: actions/checkout@v3
- name: Check for FIXMEs
uses: luator/github_action_check_new_todos@v1.0.0
uses: luator/github_action_check_new_todos@v2
with:
label: FIXME
base_ref: origin/${{ github.base_ref }}
Expand All @@ -19,10 +18,9 @@ jobs:
name: New TODOs
runs-on: ubuntu-latest
steps:
- uses: actions/checkout@v2
- run: git fetch origin ${GITHUB_BASE_REF}
- uses: actions/checkout@v3
- name: Check for TODOs
uses: luator/github_action_check_new_todos@v1.0.0
uses: luator/github_action_check_new_todos@v2
with:
label: TODO
base_ref: origin/${{ github.base_ref }}
4 changes: 4 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -11,6 +11,10 @@
### Removed
- Obsolete script `verify_calibration.py`

### Fixed
- pybind11 build error on Ubuntu 22.04


## [1.0.0] - 2022-06-28
### Added
- Executable `pylon_list_cameras` which lists all detected Pylon cameras.
Expand Down
8 changes: 7 additions & 1 deletion CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -8,10 +8,16 @@ set(CMAKE_POSITION_INDEPENDENT_CODE ON)

list(APPEND CMAKE_MODULE_PATH ${CMAKE_CURRENT_LIST_DIR}/cmake)

# pybind11 needs to be first, otherwise other packages which also search for
# Python can cause an 'Unknown CMake command "python3_add_library"' error.
# Probably related to how Python is found, see
# https://github.com/pybind/pybind11/issues/3996
find_package(pybind11 REQUIRED)
#message(FATAL "Python_FOUND = ${Python_FOUND}, Python3_FOUND = ${Python3_FOUND}")

find_package(ament_cmake REQUIRED)
find_package(ament_index_cpp REQUIRED)
find_package(mpi_cmake_modules REQUIRED)
find_package(pybind11 REQUIRED)
find_package(pybind11_opencv REQUIRED)
find_package(cereal REQUIRED)
find_package(robot_interfaces REQUIRED)
Expand Down

0 comments on commit 9ad0434

Please sign in to comment.