Skip to content

Control shared/static typesupport libraries build via CMake variable (backport #138) #148

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
mergify wants to merge 1 commit into
base: humble
Choose a base branch
from
Open

Control shared/static typesupport libraries build via CMake variable (backport #138) #148

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
6 changes: 6 additions & 0 deletions rosidl_typesupport_fastrtps_c/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -107,6 +107,12 @@ if(BUILD_TESTING)
ament_add_pytest_test(test_cli_extension test/test_cli_extension.py)
endif()

if(BUILD_SHARED_LIBS)
set(${PROJECT_NAME}_LIBRARY_TYPE "SHARED")
else()
set(${PROJECT_NAME}_LIBRARY_TYPE "STATIC")
endif()

ament_package(
CONFIG_EXTRAS "rosidl_typesupport_fastrtps_c-extras.cmake.in"
)
Expand Down
2 changes: 1 addition & 1 deletion rosidl_typesupport_fastrtps_c/cmake/rosidl_typesupport_fastrtps_c_generate_interfaces.cmake
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -101,7 +101,7 @@ configure_file(

set(_target_suffix "__rosidl_typesupport_fastrtps_c")

add_library(${rosidl_generate_interfaces_TARGET}${_target_suffix}
add_library(${rosidl_generate_interfaces_TARGET}${_target_suffix} ${rosidl_typesupport_fastrtps_c_LIBRARY_TYPE}
${_generated_files})
if(rosidl_generate_interfaces_LIBRARY_NAME)
set_target_properties(${rosidl_generate_interfaces_TARGET}${_target_suffix}
Expand Down
2 changes: 2 additions & 0 deletions rosidl_typesupport_fastrtps_c/rosidl_typesupport_fastrtps_c-extras.cmake.in
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,6 +9,8 @@ if(NOT fastcdr_FOUND)
"Could not find eProsima Fast CDR: skipping rosidl_typesupport_fastrtps_c"
)
else()
set(rosidl_typesupport_fastrtps_c_LIBRARY_TYPE "@rosidl_typesupport_fastrtps_c_LIBRARY_TYPE@")

find_package(ament_cmake_core QUIET REQUIRED)

# This generator generates code dependent on code generated by rosidl_generator_c
Expand Down
6 changes: 6 additions & 0 deletions rosidl_typesupport_fastrtps_cpp/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -113,6 +113,12 @@ if(BUILD_TESTING)
ament_add_pytest_test(test_cli_extension test/test_cli_extension.py)
endif()

if(BUILD_SHARED_LIBS)
set(${PROJECT_NAME}_LIBRARY_TYPE "SHARED")
else()
set(${PROJECT_NAME}_LIBRARY_TYPE "STATIC")
endif()

ament_package(
CONFIG_EXTRAS "rosidl_typesupport_fastrtps_cpp-extras.cmake.in"
)
Expand Down
2 changes: 1 addition & 1 deletion ..._typesupport_fastrtps_cpp/cmake/rosidl_typesupport_fastrtps_cpp_generate_interfaces.cmake
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -113,7 +113,7 @@ configure_file(
set(_target_suffix "__rosidl_typesupport_fastrtps_cpp")

# Create a library that builds the generated files
add_library(${rosidl_generate_interfaces_TARGET}${_target_suffix}
add_library(${rosidl_generate_interfaces_TARGET}${_target_suffix} ${rosidl_typesupport_fastrtps_cpp_LIBRARY_TYPE}
${_generated_files})

# Change output library name if asked to
Expand Down
2 changes: 2 additions & 0 deletions rosidl_typesupport_fastrtps_cpp/rosidl_typesupport_fastrtps_cpp-extras.cmake.in
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,6 +10,8 @@ if(NOT fastcdr_FOUND)
"Could not find eProsima Fast CDR - skip rosidl_typesupport_fastrtps_cpp"
)
else()
set(rosidl_typesupport_fastrtps_cpp_LIBRARY_TYPE "@rosidl_typesupport_fastrtps_cpp_LIBRARY_TYPE@")

find_package(ament_cmake_core QUIET REQUIRED)

# This generator generates code dependent on code generated by rosidl_generator_cpp
Expand Down