From e95c1cf911ded8c236043d578135eac16423621c Mon Sep 17 00:00:00 2001 From: Angel Martinez Date: Fri, 24 Nov 2023 11:32:05 +0100 Subject: [PATCH 1/2] Fixing issue in Dynamic Data c++ examples --- .../c++11/CMakeLists.txt | 12 ++++++++++++ .../c++98/CMakeLists.txt | 8 ++++++++ .../dynamic_data_nested_structs/c++11/CMakeLists.txt | 4 ++++ .../dynamic_data_request_reply/c++11/CMakeLists.txt | 4 ++++ .../dynamic_data_sequences/c++11/CMakeLists.txt | 4 ++++ 5 files changed, 32 insertions(+) diff --git a/examples/connext_dds/dynamic_data_access_union_discriminator/c++11/CMakeLists.txt b/examples/connext_dds/dynamic_data_access_union_discriminator/c++11/CMakeLists.txt index ba475124a..681275ef3 100644 --- a/examples/connext_dds/dynamic_data_access_union_discriminator/c++11/CMakeLists.txt +++ b/examples/connext_dds/dynamic_data_access_union_discriminator/c++11/CMakeLists.txt @@ -11,12 +11,24 @@ # cmake_minimum_required(VERSION 3.11) project(rtiexamples-dynamic-data-access-union-discriminator) + +set(CMAKE_CXX_STANDARD 11) +set(CMAKE_CXX_STANDARD_REQUIRED ON) + list(APPEND CMAKE_MODULE_PATH "${CMAKE_CURRENT_SOURCE_DIR}/../../../../resources/cmake/Modules" ) include(ConnextDdsConfigureCmakeUtils) connextdds_configure_cmake_utils() +# Find the ConnextDDS libraries. This will look for core and API libraries +find_package(RTIConnextDDS + "7.0.0" + REQUIRED + COMPONENTS + core +) + add_executable(dynamic_data_union_example_cxx2 "${CMAKE_CURRENT_SOURCE_DIR}/dynamic_data_union_example.cxx" ) diff --git a/examples/connext_dds/dynamic_data_access_union_discriminator/c++98/CMakeLists.txt b/examples/connext_dds/dynamic_data_access_union_discriminator/c++98/CMakeLists.txt index 65fe8e767..869e164dc 100644 --- a/examples/connext_dds/dynamic_data_access_union_discriminator/c++98/CMakeLists.txt +++ b/examples/connext_dds/dynamic_data_access_union_discriminator/c++98/CMakeLists.txt @@ -17,6 +17,14 @@ list(APPEND CMAKE_MODULE_PATH include(ConnextDdsConfigureCmakeUtils) connextdds_configure_cmake_utils() +# Find the ConnextDDS libraries. This will look for core and API libraries +find_package(RTIConnextDDS + "7.0.0" + REQUIRED + COMPONENTS + core +) + add_executable(dynamic_data_union_example_cxx "${CMAKE_CURRENT_SOURCE_DIR}/dynamic_data_union_example.cxx" ) diff --git a/examples/connext_dds/dynamic_data_nested_structs/c++11/CMakeLists.txt b/examples/connext_dds/dynamic_data_nested_structs/c++11/CMakeLists.txt index 4bc409dc9..ef3a6ed64 100644 --- a/examples/connext_dds/dynamic_data_nested_structs/c++11/CMakeLists.txt +++ b/examples/connext_dds/dynamic_data_nested_structs/c++11/CMakeLists.txt @@ -11,6 +11,10 @@ # cmake_minimum_required(VERSION 3.11) project(rtiexamples-dynamic-data-nested_struct) + +set(CMAKE_CXX_STANDARD 11) +set(CMAKE_CXX_STANDARD_REQUIRED ON) + list(APPEND CMAKE_MODULE_PATH "${CMAKE_CURRENT_SOURCE_DIR}/../../../../resources/cmake/Modules" ) diff --git a/examples/connext_dds/dynamic_data_request_reply/c++11/CMakeLists.txt b/examples/connext_dds/dynamic_data_request_reply/c++11/CMakeLists.txt index 4bb9c1cb6..447d56658 100644 --- a/examples/connext_dds/dynamic_data_request_reply/c++11/CMakeLists.txt +++ b/examples/connext_dds/dynamic_data_request_reply/c++11/CMakeLists.txt @@ -11,6 +11,10 @@ # cmake_minimum_required(VERSION 3.11) project(rtiexamples-dynamic-data-request_reply) + +set(CMAKE_CXX_STANDARD 11) +set(CMAKE_CXX_STANDARD_REQUIRED ON) + list(APPEND CMAKE_MODULE_PATH "${CMAKE_CURRENT_SOURCE_DIR}/../../../../resources/cmake/Modules" ) diff --git a/examples/connext_dds/dynamic_data_sequences/c++11/CMakeLists.txt b/examples/connext_dds/dynamic_data_sequences/c++11/CMakeLists.txt index 9408c8b9f..a5aa809f1 100644 --- a/examples/connext_dds/dynamic_data_sequences/c++11/CMakeLists.txt +++ b/examples/connext_dds/dynamic_data_sequences/c++11/CMakeLists.txt @@ -11,6 +11,10 @@ # cmake_minimum_required(VERSION 3.11) project(rtiexamples-dynamic-data-sequences) + +set(CMAKE_CXX_STANDARD 11) +set(CMAKE_CXX_STANDARD_REQUIRED ON) + list(APPEND CMAKE_MODULE_PATH "${CMAKE_CURRENT_SOURCE_DIR}/../../../../resources/cmake/Modules" ) From 7544b0317347820c4508343df3027ad24b097668 Mon Sep 17 00:00:00 2001 From: Angel Martinez Date: Fri, 24 Nov 2023 11:42:24 +0100 Subject: [PATCH 2/2] Changed the find_package to include it if it hasn't been included before --- .../c++11/CMakeLists.txt | 16 +++++++++------- .../c++98/CMakeLists.txt | 16 +++++++++------- .../c/CMakeLists.txt | 10 ++++++++++ 3 files changed, 28 insertions(+), 14 deletions(-) diff --git a/examples/connext_dds/dynamic_data_access_union_discriminator/c++11/CMakeLists.txt b/examples/connext_dds/dynamic_data_access_union_discriminator/c++11/CMakeLists.txt index 681275ef3..1cf5cc1af 100644 --- a/examples/connext_dds/dynamic_data_access_union_discriminator/c++11/CMakeLists.txt +++ b/examples/connext_dds/dynamic_data_access_union_discriminator/c++11/CMakeLists.txt @@ -21,13 +21,15 @@ list(APPEND CMAKE_MODULE_PATH include(ConnextDdsConfigureCmakeUtils) connextdds_configure_cmake_utils() -# Find the ConnextDDS libraries. This will look for core and API libraries -find_package(RTIConnextDDS - "7.0.0" - REQUIRED - COMPONENTS - core -) +# Find the RTI Connext DDS libraries +if(NOT RTIConnextDDS_FOUND) + find_package(RTIConnextDDS + "7.0.0" + REQUIRED + COMPONENTS + core + ) +endif() add_executable(dynamic_data_union_example_cxx2 "${CMAKE_CURRENT_SOURCE_DIR}/dynamic_data_union_example.cxx" diff --git a/examples/connext_dds/dynamic_data_access_union_discriminator/c++98/CMakeLists.txt b/examples/connext_dds/dynamic_data_access_union_discriminator/c++98/CMakeLists.txt index 869e164dc..689298005 100644 --- a/examples/connext_dds/dynamic_data_access_union_discriminator/c++98/CMakeLists.txt +++ b/examples/connext_dds/dynamic_data_access_union_discriminator/c++98/CMakeLists.txt @@ -17,13 +17,15 @@ list(APPEND CMAKE_MODULE_PATH include(ConnextDdsConfigureCmakeUtils) connextdds_configure_cmake_utils() -# Find the ConnextDDS libraries. This will look for core and API libraries -find_package(RTIConnextDDS - "7.0.0" - REQUIRED - COMPONENTS - core -) +# Find the RTI Connext DDS libraries +if(NOT RTIConnextDDS_FOUND) + find_package(RTIConnextDDS + "7.0.0" + REQUIRED + COMPONENTS + core + ) +endif() add_executable(dynamic_data_union_example_cxx "${CMAKE_CURRENT_SOURCE_DIR}/dynamic_data_union_example.cxx" diff --git a/examples/connext_dds/dynamic_data_access_union_discriminator/c/CMakeLists.txt b/examples/connext_dds/dynamic_data_access_union_discriminator/c/CMakeLists.txt index 25e4b17ce..f45657180 100644 --- a/examples/connext_dds/dynamic_data_access_union_discriminator/c/CMakeLists.txt +++ b/examples/connext_dds/dynamic_data_access_union_discriminator/c/CMakeLists.txt @@ -17,6 +17,16 @@ list(APPEND CMAKE_MODULE_PATH include(ConnextDdsConfigureCmakeUtils) connextdds_configure_cmake_utils() +# Find the RTI Connext DDS libraries +if(NOT RTIConnextDDS_FOUND) + find_package(RTIConnextDDS + "7.0.0" + REQUIRED + COMPONENTS + core + ) +endif() + add_executable(dynamic_data_union_example_c "${CMAKE_CURRENT_SOURCE_DIR}/dynamic_data_union_example.c" )