Skip to content
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

Revert "check and link against libatomic (#172)" #177

Merged
merged 1 commit into from
Aug 30, 2019
Merged

Revert "check and link against libatomic (#172)" #177

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
9 changes: 0 additions & 9 deletions CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,8 +11,6 @@ if(NOT CMAKE_CXX_STANDARD)
set(CMAKE_CXX_STANDARD 14)
endif()

include(CheckLibraryExists)

find_package(ament_cmake_python REQUIRED)
find_package(ament_cmake_ros REQUIRED)

Expand Down Expand Up @@ -123,8 +121,6 @@ if(BUILD_TESTING)

find_package(launch_testing_ament_cmake REQUIRED)

check_library_exists(atomic __atomic_load_8 "" HAVE_LIBATOMICS)

if(ament_cmake_cppcheck_FOUND)
ament_cppcheck(
TESTNAME "cppcheck_logging_macros"
Expand Down Expand Up @@ -218,11 +214,6 @@ if(BUILD_TESTING)
LANGUAGE C
)
target_link_libraries(test_atomics_executable ${PROJECT_NAME})
if(HAVE_LIBATOMICS)
target_link_libraries(test_atomics_executable atomic)
ament_export_libraries(atomic)
endif()

add_test(NAME test_atomics COMMAND test_atomics_executable)

rcutils_custom_add_gmock(test_error_handling test/test_error_handling.cpp
Expand Down