From 58f04d7eaffc2d150d891ab17889b3aa257711ba Mon Sep 17 00:00:00 2001 From: likun104 Date: Mon, 1 Sep 2025 09:31:24 +0000 Subject: [PATCH] !3020 update cxx standard to 17 Merge pull request !3020 from likun104/br_update_cxx_standard_to_17 --- CMakeLists.txt | 2 +- cmake/tests/intf_pub_linux.cmake | 72 ++++++++++++++++++++++++++------ 2 files changed, 60 insertions(+), 14 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index c92997852..002f097b9 100755 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -194,7 +194,7 @@ else() ) target_link_libraries(tf_adapter PUBLIC - $ + $ $ $ $ diff --git a/cmake/tests/intf_pub_linux.cmake b/cmake/tests/intf_pub_linux.cmake index 894329860..ed0192ce7 100644 --- a/cmake/tests/intf_pub_linux.cmake +++ b/cmake/tests/intf_pub_linux.cmake @@ -2,33 +2,79 @@ if (HAVE_PUB) return() endif() -add_library(intf_pub INTERFACE) +########## intf_pub_base ########## +add_library(intf_pub_base INTERFACE) -target_compile_options(intf_pub INTERFACE - -Wall - -fPIC +target_compile_options(intf_pub_base INTERFACE + -Wall + -fPIC $,-fstack-protector-all,-fstack-protector-strong> - $<$:-std=c++11> ) -target_compile_definitions(intf_pub INTERFACE - _GLIBCXX_USE_CXX11_ABI=0 + +target_compile_definitions(intf_pub_base INTERFACE + _GLIBCXX_USE_CXX11_ABI=0 $<$:CFG_BUILD_NDEBUG> - $<$:CFG_BUILD_DEBUG> + $<$:CFG_BUILD_DEBUG> WIN64=1 LINUX=0 LOG_CPP ) -target_link_options(intf_pub INTERFACE + +target_link_options(intf_pub_base INTERFACE -Wl,-z,relro -Wl,-z,now -Wl,-z,noexecstack - $<$:-Wl,--build-id=none> -) -target_link_directories(intf_pub INTERFACE + $<$:-Wl,--build-id=none> ) -target_link_libraries(intf_pub INTERFACE + +target_link_libraries(intf_pub_base INTERFACE -lpthread ) +########## intf_pub ########## +add_library(intf_pub INTERFACE) + +target_compile_options(intf_pub INTERFACE + $<$:-std=c++17> +) + +target_link_libraries(intf_pub INTERFACE + $ +) + +########## intf_pub c++11 ########## +add_library(intf_pub_cxx11 INTERFACE) + +target_compile_options(intf_pub_cxx11 INTERFACE + $<$:-std=c++11> +) + +target_link_libraries(intf_pub_cxx11 INTERFACE + $ +) + +########## intf_pub c++14 ########## +add_library(intf_pub_cxx14 INTERFACE) + +target_compile_options(intf_pub_cxx14 INTERFACE + $<$:-std=c++14> +) + +target_link_libraries(intf_pub_cxx14 INTERFACE + $ +) + +########## intf_pub c++17 ########## +add_library(intf_pub_cxx17 INTERFACE) + +target_compile_options(intf_pub_cxx17 INTERFACE + $<$:-std=c++17> +) + +target_link_libraries(intf_pub_cxx17 INTERFACE + $ +) + + #set(HAVE_PUB TRUE CACHE BOOL "pub add") set(HAVE_PUB TRUE) \ No newline at end of file -- Gitee