Skip to content

Modernize cmake #2

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

Open
rhaschke wants to merge 2 commits into
base: master
Choose a base branch
from
Open

Modernize cmake #2

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
5e7a974
Modernize cmake files
rhaschke Feb 23, 2025
f5809e8
Silent unused arguments warning
rhaschke Feb 23, 2025
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
5 changes: 2 additions & 3 deletions classes/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
cmake_minimum_required(VERSION 3.0.2)
cmake_minimum_required(VERSION 3.12)
project(classes)

find_package(catkin REQUIRED COMPONENTS
Expand All @@ -9,8 +9,7 @@ catkin_package(
CATKIN_DEPENDS pybind11_catkin
)

include_directories(${PROJECT_SOURCE_DIR}/include
${catkin_INCLUDE_DIRS})
include_directories(${PROJECT_SOURCE_DIR}/include)


pybind_add_module(dog MODULE src/dog.cpp src/cat.cpp)
Expand Down
10 changes: 3 additions & 7 deletions cpp_object_attr/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,8 +1,6 @@
cmake_minimum_required(VERSION 3.0.2)
cmake_minimum_required(VERSION 3.12)
project(cpp_object_attr)

find_package(PythonLibs REQUIRED)

find_package(catkin REQUIRED COMPONENTS
pybind11_catkin)

Expand All @@ -13,12 +11,10 @@ catkin_package(
CATKIN_DEPENDS pybind11_catkin
)

include_directories(${PYTHON_INCLUDE_DIRS} ${catkin_INCLUDE_DIRS})

pybind_add_module(cpp_object MODULE src/cpp_object.cpp)
pybind_add_module(example SHARED src/example.cpp )
pybind_add_module(example SHARED src/example.cpp)
add_executable(main src/main.cpp)
target_link_libraries(main ${PYTHON_LIBRARIES} example)
target_link_libraries(main example pybind11::embed)

install(TARGETS main
cpp_object
Expand Down
4 changes: 2 additions & 2 deletions cpp_object_attr/src/main.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
#include "example.cpp"

int main(int argc, char **argv) {
int main(int /*argc*/, char ** /*argv*/)
{
example();
return 0;
}

4 changes: 1 addition & 3 deletions function_call/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
cmake_minimum_required(VERSION 3.0.2)
cmake_minimum_required(VERSION 3.12)
project(function_call)

find_package(catkin REQUIRED COMPONENTS
Expand All @@ -9,8 +9,6 @@ catkin_package(
CATKIN_DEPENDS pybind11_catkin
)

include_directories(${catkin_INCLUDE_DIRS})

pybind_add_module(logger MODULE src/logger.cpp)

catkin_install_python(PROGRAMS scripts/hello_world.py
Expand Down
5 changes: 2 additions & 3 deletions inheritance/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
cmake_minimum_required(VERSION 3.0.2)
cmake_minimum_required(VERSION 3.12)
project(inheritance)

find_package(catkin REQUIRED COMPONENTS
Expand All @@ -9,8 +9,7 @@ catkin_package(
CATKIN_DEPENDS pybind11_catkin
)

include_directories(${PROJECT_SOURCE_DIR}/include
${catkin_INCLUDE_DIRS})
include_directories(${PROJECT_SOURCE_DIR}/include)

pybind_add_module(pet MODULE src/pet.cpp)

Expand Down
12 changes: 4 additions & 8 deletions plugin/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,9 +1,7 @@
cmake_minimum_required(VERSION 3.0.2)
cmake_minimum_required(VERSION 3.12)
project(plugin)
add_compile_options(-Wno-attributes -std=c++11)

find_package(PythonLibs REQUIRED)

find_package(catkin REQUIRED COMPONENTS
pybind11_catkin)

Expand All @@ -14,18 +12,16 @@ catkin_package(
CATKIN_DEPENDS pybind11_catkin
)

include_directories(${PROJECT_SOURCE_DIR}/include
${PYTHON_INCLUDE_DIRS}
${catkin_INCLUDE_DIRS})
include_directories(${PROJECT_SOURCE_DIR}/include)

add_library(base_plugin SHARED src/base_plugin.cpp)
add_library(plugin_wrapper SHARED src/plugin_wrapper.cpp)
target_link_libraries(plugin_wrapper ${PYTHON_LIBRARIES} base_plugin)
target_link_libraries(plugin_wrapper base_plugin pybind11::embed)

pybind_add_module(py_base_plugin MODULE src/py_base_plugin.cpp)

add_executable(plugin_runner src/plugin_runner.cpp)
target_link_libraries(plugin_runner ${PYTHON_LIBRARIES} base_plugin plugin_wrapper)
target_link_libraries(plugin_runner base_plugin plugin_wrapper)

install(TARGETS plugin_runner
base_plugin
Expand Down
4 changes: 2 additions & 2 deletions plugin/src/plugin_runner.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,8 +21,8 @@ void PluginRunner::run()
}
}


int main(int argc, char **argv) {
int main(int /*argc*/, char ** /*argv*/)
{
PluginRunner plugin_runner;
plugin_runner.add(new PluginWrapper("plugin.custom_plugin", "CustomPlugin"));
plugin_runner.run();
Expand Down