diff --git a/CMakeLists.txt b/CMakeLists.txt index b8adb2f3..d4584be1 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -45,7 +45,7 @@ endif() set(rcutils_sources src/allocator.c src/array_list.c - src/base64.c + $<$>:src/base64.c> src/char_array.c src/cmdline_parser.c src/env.c @@ -100,11 +100,10 @@ configure_file( ) target_link_libraries(${PROJECT_NAME} - ${CMAKE_DL_LIBS} ament_cmake_ros_core::ament_ros_defaults ) if(NOT RCUTILS_NO_FILESYSTEM) - target_link_libraries(${PROJECT_NAME} PUBLIC ${CMAKE_DL_LIBS}) + target_link_libraries(${PROJECT_NAME} ${CMAKE_DL_LIBS}) endif() check_library_exists(atomic __atomic_load_8 "" HAVE_LIBATOMICS) @@ -694,11 +693,13 @@ if(BUILD_TESTING) target_link_libraries(benchmark_err_handle ${PROJECT_NAME} ament_cmake_ros_core::ament_ros_defaults) endif() - ament_add_gtest(test_base64 - test/test_base64.cpp - ) - if(TARGET test_base64) - target_link_libraries(test_base64 ${PROJECT_NAME} ament_cmake_ros_core::ament_ros_defaults) + if(NOT RCUTILS_MICROROS) + ament_add_gtest(test_base64 + test/test_base64.cpp + ) + if(TARGET test_base64) + target_link_libraries(test_base64 ${PROJECT_NAME} ament_cmake_ros_core::ament_ros_defaults) + endif() endif() endif()