From 05e7336b2160739915be0e2c4a81710806fd2f9c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Timo=20R=C3=B6hling?= Date: Sat, 17 Sep 2022 21:14:01 +0200 Subject: [PATCH] Export -latomic even if BUILD_TESTING is disabled MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: Timo Röhling --- CMakeLists.txt | 15 ++++++++------- 1 file changed, 8 insertions(+), 7 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index ee7a2c69..b08107af 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -132,6 +132,14 @@ endif() target_link_libraries(${PROJECT_NAME} ${CMAKE_DL_LIBS}) +check_library_exists(atomic __atomic_load_8 "" HAVE_LIBATOMICS) + +if(HAVE_LIBATOMICS AND NOT WIN32) + # Exporting link flag since it won't pass ament_export_libraries() existance check + ament_export_link_flags("-latomic") + target_link_libraries(${PROJECT_NAME} atomic) +endif() + # Needed if pthread is used for thread local storage. if(IOS AND IOS_SDK_VERSION LESS 10.0) ament_export_libraries(pthread) @@ -157,13 +165,6 @@ if(BUILD_TESTING) find_package(launch_testing_ament_cmake REQUIRED) - check_library_exists(atomic __atomic_load_8 "" HAVE_LIBATOMICS) - - if(HAVE_LIBATOMICS AND NOT WIN32) - # Exporting link flag since it won't pass ament_export_libraries() existance check - ament_export_link_flags("-latomic") - endif() - if(ament_cmake_cppcheck_FOUND) ament_cppcheck( TESTNAME "cppcheck_logging_macros"