From fb03e6afbb57643d62ad24b8c16539ef90511848 Mon Sep 17 00:00:00 2001 From: Adrien Maret Date: Wed, 24 May 2023 17:35:59 +0200 Subject: [PATCH 1/4] Update CMakeLists.txt fix compilation --- CMakeLists.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index 2fa3908..d6bd0b2 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -21,7 +21,7 @@ my_protobuf_generate_cpp(cld_3/protos PROTO_SRCS PROTO_HDRS src/feature_extracto message(STATUS "PROTO_HDRS= ${PROTO_HDRS}") add_definitions(-fPIC) # Position Independant Code -add_definitions(-D_GLIBCXX_USE_CXX11_ABI=0) +# add_definitions(-D_GLIBCXX_USE_CXX11_ABI=0) add_definitions(-std=c++11) # Needed for std::to_string(), ... include_directories(${CMAKE_CURRENT_BINARY_DIR} ${Protobuf_INCLUDE_DIRS}) # needed to include generated pb headers From cf894ace3fce97d835ef4b11f74b61545ecd8b40 Mon Sep 17 00:00:00 2001 From: Adrien Maret Date: Wed, 24 May 2023 17:37:37 +0200 Subject: [PATCH 2/4] Update CMakeLists.txt remove dual ABI macro --- CMakeLists.txt | 1 - 1 file changed, 1 deletion(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index d6bd0b2..3ec9385 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -21,7 +21,6 @@ my_protobuf_generate_cpp(cld_3/protos PROTO_SRCS PROTO_HDRS src/feature_extracto message(STATUS "PROTO_HDRS= ${PROTO_HDRS}") add_definitions(-fPIC) # Position Independant Code -# add_definitions(-D_GLIBCXX_USE_CXX11_ABI=0) add_definitions(-std=c++11) # Needed for std::to_string(), ... include_directories(${CMAKE_CURRENT_BINARY_DIR} ${Protobuf_INCLUDE_DIRS}) # needed to include generated pb headers From aa5cd950982f0f41d6679a34d220fa9003b081ce Mon Sep 17 00:00:00 2001 From: Adrien Maret Date: Wed, 24 May 2023 17:42:38 +0200 Subject: [PATCH 3/4] Update CMakeLists.txt --- CMakeLists.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index 3ec9385..7aa3f56 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -8,7 +8,7 @@ cmake_minimum_required(VERSION 3.9) find_package(Protobuf REQUIRED) message(STATUS "Protobuf_FOUND= ${Protobuf_FOUND}") message(STATUS "Protobuf_VERSION= ${Protobuf_VERSION}") -message(WARNING "Protobuf 2.5 and CLD3 seems happy together. This script does NOT check if your verison of protobuf is compatible.") +message(WARNING "Protobuf 3 and CLD3 seems happy together. This script does NOT check if your verison of protobuf is compatible.") message(STATUS "Protobuf_LIBRARIES= ${Protobuf_LIBRARIES}") message(STATUS "Protobuf_LITE_LIBRARIES= ${Protobuf_LITE_LIBRARIES}") # Usually /usr/lib64/libprotobuf-lite.so From be5df91cd1c8d319fafab2e7d92330fcd20535dc Mon Sep 17 00:00:00 2001 From: Adrien Maret Date: Wed, 24 May 2023 18:13:44 +0200 Subject: [PATCH 4/4] Update CMakeLists.txt typo --- CMakeLists.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index 7aa3f56..0ebae23 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -8,7 +8,7 @@ cmake_minimum_required(VERSION 3.9) find_package(Protobuf REQUIRED) message(STATUS "Protobuf_FOUND= ${Protobuf_FOUND}") message(STATUS "Protobuf_VERSION= ${Protobuf_VERSION}") -message(WARNING "Protobuf 3 and CLD3 seems happy together. This script does NOT check if your verison of protobuf is compatible.") +message(WARNING "Protobuf 3 and CLD3 seems happy together. This script does NOT check if your version of protobuf is compatible.") message(STATUS "Protobuf_LIBRARIES= ${Protobuf_LIBRARIES}") message(STATUS "Protobuf_LITE_LIBRARIES= ${Protobuf_LITE_LIBRARIES}") # Usually /usr/lib64/libprotobuf-lite.so