From 4fbb65bc1f0fd7068c84fb8c850f1fc81c25ef4e Mon Sep 17 00:00:00 2001 From: Pablo Garrido Date: Tue, 26 Apr 2022 07:58:37 +0200 Subject: [PATCH 1/2] Fix atomic 64 b description (#17) (cherry picked from commit 85efa4ad786fb6920ae92156ab439dec0315299b) # Conflicts: # CMakeLists.txt --- CMakeLists.txt | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/CMakeLists.txt b/CMakeLists.txt index 9d6a8fd5..9debaab1 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -5,7 +5,12 @@ project(rcutils) option(RCUTILS_NO_THREAD_SUPPORT "Disable thread support." OFF) option(RCUTILS_NO_FILESYSTEM "Disable filesystem usage." OFF) option(RCUTILS_AVOID_DYNAMIC_ALLOCATION "Disable dynamic allocations." OFF) +<<<<<<< HEAD option(RCUTILS_NO_64_ATOMIC "Disable support for 64 bits atomic operations." OFF) +======= +option(RCUTILS_NO_64_ATOMIC "Enable alternative support for 64 bits atomic operations in platforms with no native support." OFF) +option(RCUTILS_MICROROS "Flag for building micro-ROS." ON) +>>>>>>> 85efa4a (Fix atomic 64 b description (#17)) # Default to C11 if(NOT CMAKE_C_STANDARD) From e6e494e0d250eec5a898ecc8af83ef194793d710 Mon Sep 17 00:00:00 2001 From: Pablo Garrido Date: Tue, 26 Apr 2022 08:02:20 +0200 Subject: [PATCH 2/2] Fix conflicts Signed-off-by: Pablo Garrido --- CMakeLists.txt | 5 ----- 1 file changed, 5 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index 9debaab1..02f7a5c4 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -5,12 +5,7 @@ project(rcutils) option(RCUTILS_NO_THREAD_SUPPORT "Disable thread support." OFF) option(RCUTILS_NO_FILESYSTEM "Disable filesystem usage." OFF) option(RCUTILS_AVOID_DYNAMIC_ALLOCATION "Disable dynamic allocations." OFF) -<<<<<<< HEAD -option(RCUTILS_NO_64_ATOMIC "Disable support for 64 bits atomic operations." OFF) -======= option(RCUTILS_NO_64_ATOMIC "Enable alternative support for 64 bits atomic operations in platforms with no native support." OFF) -option(RCUTILS_MICROROS "Flag for building micro-ROS." ON) ->>>>>>> 85efa4a (Fix atomic 64 b description (#17)) # Default to C11 if(NOT CMAKE_C_STANDARD)