Skip to content

use C++ 20 in default #297

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
ahcorde wants to merge 1 commit into
base: rolling
Choose a base branch
from
+6 −7
Open

use C++ 20 in default #297

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
11 changes: 4 additions & 7 deletions pluginlib/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,17 +1,12 @@
cmake_minimum_required(VERSION 3.20)
project(pluginlib)

# Default to C++17
if(NOT CMAKE_CXX_STANDARD)
set(CMAKE_CXX_STANDARD 17)
set(CMAKE_CXX_STANDARD_REQUIRED ON)
endif()

if(CMAKE_COMPILER_IS_GNUCXX OR CMAKE_CXX_COMPILER_ID MATCHES "Clang")
add_compile_options(-Wall -Wextra -Wpedantic)
endif()

find_package(ament_cmake REQUIRED)
find_package(ament_cmake_ros_core REQUIRED)
find_package(ament_index_cpp REQUIRED)
find_package(class_loader REQUIRED)
find_package(rcutils REQUIRED)
Expand All @@ -23,6 +18,7 @@ target_include_directories(${PROJECT_NAME} INTERFACE
"$<BUILD_INTERFACE:${CMAKE_CURRENT_SOURCE_DIR}/include>"
"$<INSTALL_INTERFACE:include/${PROJECT_NAME}>")
target_link_libraries(${PROJECT_NAME} INTERFACE
ament_cmake_ros_core::ament_ros_defaults
ament_index_cpp::ament_index_cpp
class_loader::class_loader
rcutils::rcutils
Expand All @@ -41,7 +37,8 @@ install(TARGETS list_plugins
DESTINATION lib/${PROJECT_NAME}
)

ament_export_dependencies(ament_index_cpp class_loader rcutils rcpputils TinyXML2)
ament_export_dependencies(
ament_cmake_ros_core ament_index_cpp class_loader rcutils rcpputils TinyXML2)

# Export old-style CMake variables
ament_export_include_directories("include/${PROJECT_NAME}")
Expand Down
2 changes: 2 additions & 0 deletions pluginlib/package.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,6 +22,8 @@
<author>Tully Foote</author>

<buildtool_depend>ament_cmake</buildtool_depend>
<buildtool_depend>ament_cmake_ros_core</buildtool_depend>
<buildtool_export_depend>ament_cmake_ros_core</buildtool_export_depend>

<depend>ament_index_cpp</depend>
<depend>class_loader</depend>
Expand Down