From f2c363adeb2dda3cf69f2c92cd853a8909393bed Mon Sep 17 00:00:00 2001 From: Chris Lalancette <clalancette@gmail.com> Date: Tue, 10 Oct 2023 20:45:07 +0000 Subject: [PATCH 1/2] Fix the clang build for clang 14. clang 14 does not understand -Wno-deprecated-builtins, which causes problems trying to compile Fast-DDS on Ubuntu 22.04 Signed-off-by: Chris Lalancette <clalancette@gmail.com> --- CMakeLists.txt | 1 - 1 file changed, 1 deletion(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index 90d75b0f097..54778d71906 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -75,7 +75,6 @@ else() set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Wno-psabi") set(CMAKE_SHARED_LINKER_FLAGS "${CMAKE_SHARED_LINKER_FLAGS} -Wl,--no-undefined") elseif(CMAKE_CXX_COMPILER_ID MATCHES "Clang") - set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Wno-deprecated-builtins") set(CMAKE_SHARED_LINKER_FLAGS "${CMAKE_SHARED_LINKER_FLAGS} -Wl") endif() From 17a0a6fef29e54bb5f6635b5ade52c08c743123a Mon Sep 17 00:00:00 2001 From: Chris Lalancette <clalancette@gmail.com> Date: Wed, 11 Oct 2023 12:20:28 +0000 Subject: [PATCH 2/2] Only add the flag for Clang 15 and newer. Signed-off-by: Chris Lalancette <clalancette@gmail.com> --- CMakeLists.txt | 3 +++ 1 file changed, 3 insertions(+) diff --git a/CMakeLists.txt b/CMakeLists.txt index 54778d71906..770e4daa14e 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -75,6 +75,9 @@ else() set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Wno-psabi") set(CMAKE_SHARED_LINKER_FLAGS "${CMAKE_SHARED_LINKER_FLAGS} -Wl,--no-undefined") elseif(CMAKE_CXX_COMPILER_ID MATCHES "Clang") + if(CMAKE_CXX_COMPILER_VERSION VERSION_GREATER_EQUAL 15,0) + set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Wno-deprecated-builtins") + endif() set(CMAKE_SHARED_LINKER_FLAGS "${CMAKE_SHARED_LINKER_FLAGS} -Wl") endif()