From 69b3e6ac5b392ff460cb1ea155f6efa9718cc633 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jes=C3=BAs=20Poderoso?= <120394830+JesusPoderoso@users.noreply.github.com> Date: Wed, 10 Jan 2024 08:54:39 +0100 Subject: [PATCH] Downgrade CMake minimum version to 3.20 (#4218) * Refs #20176: downgrade cmake version Signed-off-by: JesusPoderoso * Refs #20176: Require CMake minimum version 3.22 only for tests Signed-off-by: JesusPoderoso * Refs #20176: Move test requirement to common function Signed-off-by: JesusPoderoso * Refs #20176: Apply rev suggestions Signed-off-by: JesusPoderoso --------- Signed-off-by: JesusPoderoso --- CMakeLists.txt | 2 +- cmake/testing/GoogleTest.cmake | 1 + .../cpp/dds/AdvancedConfigurationExample/CMakeLists.txt | 2 +- examples/cpp/dds/BasicConfigurationExample/CMakeLists.txt | 2 +- examples/cpp/dds/Configurability/CMakeLists.txt | 2 +- .../cpp/dds/ContentFilteredTopicExample/CMakeLists.txt | 2 +- examples/cpp/dds/CustomListenerExample/CMakeLists.txt | 2 +- examples/cpp/dds/CustomPayloadPoolExample/CMakeLists.txt | 2 +- examples/cpp/dds/DeadlineQoSExample/CMakeLists.txt | 2 +- examples/cpp/dds/DisablePositiveACKs/CMakeLists.txt | 2 +- examples/cpp/dds/DiscoveryServerExample/CMakeLists.txt | 2 +- examples/cpp/dds/DynamicHelloWorldExample/CMakeLists.txt | 2 +- examples/cpp/dds/Filtering/CMakeLists.txt | 2 +- examples/cpp/dds/FlowControlExample/CMakeLists.txt | 2 +- examples/cpp/dds/HelloWorldExample/CMakeLists.txt | 2 +- .../cpp/dds/HelloWorldExampleDataSharing/CMakeLists.txt | 2 +- .../cpp/dds/HelloWorldExampleSharedMem/CMakeLists.txt | 2 +- examples/cpp/dds/HelloWorldExampleTCP/CMakeLists.txt | 2 +- examples/cpp/dds/HistoryKind/CMakeLists.txt | 2 +- examples/cpp/dds/Keys/CMakeLists.txt | 2 +- examples/cpp/dds/LateJoiners/CMakeLists.txt | 2 +- examples/cpp/dds/LifespanQoSExample/CMakeLists.txt | 2 +- examples/cpp/dds/LivelinessQoS/CMakeLists.txt | 2 +- .../cpp/dds/OwnershipStrengthQoSExample/CMakeLists.txt | 2 +- examples/cpp/dds/RequestReplyExample/CMakeLists.txt | 2 +- examples/cpp/dds/SampleConfig_Controller/CMakeLists.txt | 2 +- examples/cpp/dds/SampleConfig_Events/CMakeLists.txt | 2 +- examples/cpp/dds/SampleConfig_Multimedia/CMakeLists.txt | 2 +- examples/cpp/dds/SecureHelloWorldExample/CMakeLists.txt | 2 +- examples/cpp/dds/StaticHelloWorldExample/CMakeLists.txt | 2 +- examples/cpp/dds/TypeLookupService/CMakeLists.txt | 2 +- examples/cpp/dds/WriterLoansExample/CMakeLists.txt | 2 +- examples/cpp/dds/ZeroCopyExample/CMakeLists.txt | 2 +- examples/cpp/rtps/AsSocket/CMakeLists.txt | 2 +- examples/cpp/rtps/Persistent/CMakeLists.txt | 2 +- examples/cpp/rtps/Registered/CMakeLists.txt | 2 +- fuzz/C++/fuzz_XMLProfiles/CMakeLists.txt | 2 +- fuzz/C++/fuzz_processCDRMsg/CMakeLists.txt | 2 +- test/CMakeLists.txt | 8 ++++---- test/profiling/allocations/CMakeLists.txt | 2 +- test/unittest/cmake/force_cxx/CMakeLists.txt | 2 +- thirdparty/optionparser/CMakeLists.txt | 2 +- tools/fds/CMakeLists.txt | 2 +- 43 files changed, 46 insertions(+), 45 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index 9daaec22f5e..f950266cdfb 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -15,7 +15,7 @@ ############################################################################### # CMake build rules for Fast DDS ############################################################################### -cmake_minimum_required(VERSION 3.22) +cmake_minimum_required(VERSION 3.20) # Set CMAKE_BUILD_TYPE to Release by default. if(NOT CMAKE_BUILD_TYPE AND NOT CMAKE_CONFIGURATION_TYPES) diff --git a/cmake/testing/GoogleTest.cmake b/cmake/testing/GoogleTest.cmake index b14299e28d6..137c7a5c1f5 100644 --- a/cmake/testing/GoogleTest.cmake +++ b/cmake/testing/GoogleTest.cmake @@ -15,6 +15,7 @@ include(GoogleTest) function(gtest_discover_tests TARGET) + cmake_minimum_required(VERSION 3.22) if (WIN32) add_custom_command( TARGET ${TARGET} POST_BUILD diff --git a/examples/cpp/dds/AdvancedConfigurationExample/CMakeLists.txt b/examples/cpp/dds/AdvancedConfigurationExample/CMakeLists.txt index cb0f181b7f1..b58e08d8e87 100644 --- a/examples/cpp/dds/AdvancedConfigurationExample/CMakeLists.txt +++ b/examples/cpp/dds/AdvancedConfigurationExample/CMakeLists.txt @@ -12,7 +12,7 @@ # See the License for the specific language governing permissions and # limitations under the License. -cmake_minimum_required(VERSION 3.22) +cmake_minimum_required(VERSION 3.20) project(AdvancedConfigurationExample VERSION 1 LANGUAGES CXX) diff --git a/examples/cpp/dds/BasicConfigurationExample/CMakeLists.txt b/examples/cpp/dds/BasicConfigurationExample/CMakeLists.txt index 2a0160946ed..5b951d5e9d2 100644 --- a/examples/cpp/dds/BasicConfigurationExample/CMakeLists.txt +++ b/examples/cpp/dds/BasicConfigurationExample/CMakeLists.txt @@ -12,7 +12,7 @@ # See the License for the specific language governing permissions and # limitations under the License. -cmake_minimum_required(VERSION 3.22) +cmake_minimum_required(VERSION 3.20) project(BasicConfigurationExample VERSION 1 LANGUAGES CXX) diff --git a/examples/cpp/dds/Configurability/CMakeLists.txt b/examples/cpp/dds/Configurability/CMakeLists.txt index 0c2d9d39012..3be7f877c7d 100644 --- a/examples/cpp/dds/Configurability/CMakeLists.txt +++ b/examples/cpp/dds/Configurability/CMakeLists.txt @@ -12,7 +12,7 @@ # See the License for the specific language governing permissions and # limitations under the License. -cmake_minimum_required(VERSION 3.22) +cmake_minimum_required(VERSION 3.20) project(Configurability VERSION 1 LANGUAGES CXX) diff --git a/examples/cpp/dds/ContentFilteredTopicExample/CMakeLists.txt b/examples/cpp/dds/ContentFilteredTopicExample/CMakeLists.txt index b556d135900..abbbc4f3c0d 100644 --- a/examples/cpp/dds/ContentFilteredTopicExample/CMakeLists.txt +++ b/examples/cpp/dds/ContentFilteredTopicExample/CMakeLists.txt @@ -12,7 +12,7 @@ # See the License for the specific language governing permissions and # limitations under the License. -cmake_minimum_required(VERSION 3.22) +cmake_minimum_required(VERSION 3.20) project("ContentFilterTopic" VERSION 1 LANGUAGES CXX) diff --git a/examples/cpp/dds/CustomListenerExample/CMakeLists.txt b/examples/cpp/dds/CustomListenerExample/CMakeLists.txt index 7ba32ee3f97..8a9d42515a1 100644 --- a/examples/cpp/dds/CustomListenerExample/CMakeLists.txt +++ b/examples/cpp/dds/CustomListenerExample/CMakeLists.txt @@ -12,7 +12,7 @@ # See the License for the specific language governing permissions and # limitations under the License. -cmake_minimum_required(VERSION 3.22) +cmake_minimum_required(VERSION 3.20) project(DDSCustomListener VERSION 1 LANGUAGES CXX) diff --git a/examples/cpp/dds/CustomPayloadPoolExample/CMakeLists.txt b/examples/cpp/dds/CustomPayloadPoolExample/CMakeLists.txt index 43dca48ab05..1b61ca13b7e 100644 --- a/examples/cpp/dds/CustomPayloadPoolExample/CMakeLists.txt +++ b/examples/cpp/dds/CustomPayloadPoolExample/CMakeLists.txt @@ -12,7 +12,7 @@ # See the License for the specific language governing permissions and # limitations under the License. -cmake_minimum_required(VERSION 3.16.3) +cmake_minimum_required(VERSION 3.20) project(CustomPayloadPoolExample VERSION 1 LANGUAGES CXX) diff --git a/examples/cpp/dds/DeadlineQoSExample/CMakeLists.txt b/examples/cpp/dds/DeadlineQoSExample/CMakeLists.txt index dab105eb6c9..4a5f3ba2af1 100644 --- a/examples/cpp/dds/DeadlineQoSExample/CMakeLists.txt +++ b/examples/cpp/dds/DeadlineQoSExample/CMakeLists.txt @@ -12,7 +12,7 @@ # See the License for the specific language governing permissions and # limitations under the License. -cmake_minimum_required(VERSION 3.22) +cmake_minimum_required(VERSION 3.20) project(DeadlineQoSExample VERSION 1 LANGUAGES CXX) diff --git a/examples/cpp/dds/DisablePositiveACKs/CMakeLists.txt b/examples/cpp/dds/DisablePositiveACKs/CMakeLists.txt index 4382c96aac5..3dc4e941b59 100644 --- a/examples/cpp/dds/DisablePositiveACKs/CMakeLists.txt +++ b/examples/cpp/dds/DisablePositiveACKs/CMakeLists.txt @@ -12,7 +12,7 @@ # See the License for the specific language governing permissions and # limitations under the License. -cmake_minimum_required(VERSION 3.22) +cmake_minimum_required(VERSION 3.20) project(LifespanQoSExample VERSION 1 LANGUAGES CXX) diff --git a/examples/cpp/dds/DiscoveryServerExample/CMakeLists.txt b/examples/cpp/dds/DiscoveryServerExample/CMakeLists.txt index 885708605d6..5c09eaaad0f 100644 --- a/examples/cpp/dds/DiscoveryServerExample/CMakeLists.txt +++ b/examples/cpp/dds/DiscoveryServerExample/CMakeLists.txt @@ -12,7 +12,7 @@ # See the License for the specific language governing permissions and # limitations under the License. -cmake_minimum_required(VERSION 3.22) +cmake_minimum_required(VERSION 3.20) project(DiscoveryServerExample VERSION 1 LANGUAGES CXX) diff --git a/examples/cpp/dds/DynamicHelloWorldExample/CMakeLists.txt b/examples/cpp/dds/DynamicHelloWorldExample/CMakeLists.txt index b1eb3dd5053..b5b42c636a0 100644 --- a/examples/cpp/dds/DynamicHelloWorldExample/CMakeLists.txt +++ b/examples/cpp/dds/DynamicHelloWorldExample/CMakeLists.txt @@ -12,7 +12,7 @@ # See the License for the specific language governing permissions and # limitations under the License. -cmake_minimum_required(VERSION 3.22) +cmake_minimum_required(VERSION 3.20) project(DDSDynamicHelloWorldExample VERSION 1 LANGUAGES CXX) diff --git a/examples/cpp/dds/Filtering/CMakeLists.txt b/examples/cpp/dds/Filtering/CMakeLists.txt index 5fb9d9dedad..3255936b8d4 100644 --- a/examples/cpp/dds/Filtering/CMakeLists.txt +++ b/examples/cpp/dds/Filtering/CMakeLists.txt @@ -12,7 +12,7 @@ # See the License for the specific language governing permissions and # limitations under the License. -cmake_minimum_required(VERSION 3.22) +cmake_minimum_required(VERSION 3.20) project(FilteringExample VERSION 1 LANGUAGES CXX) diff --git a/examples/cpp/dds/FlowControlExample/CMakeLists.txt b/examples/cpp/dds/FlowControlExample/CMakeLists.txt index 1d88ab09422..e321364d0e4 100644 --- a/examples/cpp/dds/FlowControlExample/CMakeLists.txt +++ b/examples/cpp/dds/FlowControlExample/CMakeLists.txt @@ -12,7 +12,7 @@ # See the License for the specific language governing permissions and # limitations under the License. -cmake_minimum_required(VERSION 3.22) +cmake_minimum_required(VERSION 3.20) project(FlowControlExample VERSION 1 LANGUAGES CXX) diff --git a/examples/cpp/dds/HelloWorldExample/CMakeLists.txt b/examples/cpp/dds/HelloWorldExample/CMakeLists.txt index c8e914f4eaf..583847ee4f5 100644 --- a/examples/cpp/dds/HelloWorldExample/CMakeLists.txt +++ b/examples/cpp/dds/HelloWorldExample/CMakeLists.txt @@ -12,7 +12,7 @@ # See the License for the specific language governing permissions and # limitations under the License. -cmake_minimum_required(VERSION 3.22) +cmake_minimum_required(VERSION 3.20) project(DDSHelloWorldExample VERSION 1 LANGUAGES CXX) diff --git a/examples/cpp/dds/HelloWorldExampleDataSharing/CMakeLists.txt b/examples/cpp/dds/HelloWorldExampleDataSharing/CMakeLists.txt index 9f833c072ca..424624e354d 100644 --- a/examples/cpp/dds/HelloWorldExampleDataSharing/CMakeLists.txt +++ b/examples/cpp/dds/HelloWorldExampleDataSharing/CMakeLists.txt @@ -12,7 +12,7 @@ # See the License for the specific language governing permissions and # limitations under the License. -cmake_minimum_required(VERSION 3.22) +cmake_minimum_required(VERSION 3.20) project(DDSHelloWorldExampleDataSharing VERSION 1 LANGUAGES CXX) diff --git a/examples/cpp/dds/HelloWorldExampleSharedMem/CMakeLists.txt b/examples/cpp/dds/HelloWorldExampleSharedMem/CMakeLists.txt index fc8148d1686..d7d8d045222 100644 --- a/examples/cpp/dds/HelloWorldExampleSharedMem/CMakeLists.txt +++ b/examples/cpp/dds/HelloWorldExampleSharedMem/CMakeLists.txt @@ -12,7 +12,7 @@ # See the License for the specific language governing permissions and # limitations under the License. -cmake_minimum_required(VERSION 3.22) +cmake_minimum_required(VERSION 3.20) project(HelloWorldExampleSharedMem VERSION 1 LANGUAGES CXX) diff --git a/examples/cpp/dds/HelloWorldExampleTCP/CMakeLists.txt b/examples/cpp/dds/HelloWorldExampleTCP/CMakeLists.txt index 2d9f90372f3..e98a20ff119 100644 --- a/examples/cpp/dds/HelloWorldExampleTCP/CMakeLists.txt +++ b/examples/cpp/dds/HelloWorldExampleTCP/CMakeLists.txt @@ -12,7 +12,7 @@ # See the License for the specific language governing permissions and # limitations under the License. -cmake_minimum_required(VERSION 3.22) +cmake_minimum_required(VERSION 3.20) project("HelloWorldExampleTCP" VERSION 1 LANGUAGES CXX) diff --git a/examples/cpp/dds/HistoryKind/CMakeLists.txt b/examples/cpp/dds/HistoryKind/CMakeLists.txt index a83f3ddb74b..9f6462776c9 100644 --- a/examples/cpp/dds/HistoryKind/CMakeLists.txt +++ b/examples/cpp/dds/HistoryKind/CMakeLists.txt @@ -12,7 +12,7 @@ # See the License for the specific language governing permissions and # limitations under the License. -cmake_minimum_required(VERSION 3.22) +cmake_minimum_required(VERSION 3.20) project(HistoryKindSample VERSION 1 LANGUAGES CXX) diff --git a/examples/cpp/dds/Keys/CMakeLists.txt b/examples/cpp/dds/Keys/CMakeLists.txt index b2443072e91..2cb9c151b80 100644 --- a/examples/cpp/dds/Keys/CMakeLists.txt +++ b/examples/cpp/dds/Keys/CMakeLists.txt @@ -12,7 +12,7 @@ # See the License for the specific language governing permissions and # limitations under the License. -cmake_minimum_required(VERSION 3.22) +cmake_minimum_required(VERSION 3.20) project(KeysSample VERSION 1 LANGUAGES CXX) diff --git a/examples/cpp/dds/LateJoiners/CMakeLists.txt b/examples/cpp/dds/LateJoiners/CMakeLists.txt index d7194083387..fd683dc6d23 100644 --- a/examples/cpp/dds/LateJoiners/CMakeLists.txt +++ b/examples/cpp/dds/LateJoiners/CMakeLists.txt @@ -12,7 +12,7 @@ # See the License for the specific language governing permissions and # limitations under the License. -cmake_minimum_required(VERSION 3.22) +cmake_minimum_required(VERSION 3.20) project(LateJoiners VERSION 1 LANGUAGES CXX) diff --git a/examples/cpp/dds/LifespanQoSExample/CMakeLists.txt b/examples/cpp/dds/LifespanQoSExample/CMakeLists.txt index 705fe8213a8..0e9f9ce97d6 100644 --- a/examples/cpp/dds/LifespanQoSExample/CMakeLists.txt +++ b/examples/cpp/dds/LifespanQoSExample/CMakeLists.txt @@ -12,7 +12,7 @@ # See the License for the specific language governing permissions and # limitations under the License. -cmake_minimum_required(VERSION 3.22) +cmake_minimum_required(VERSION 3.20) project(LifespanQoSExample VERSION 1 LANGUAGES CXX) diff --git a/examples/cpp/dds/LivelinessQoS/CMakeLists.txt b/examples/cpp/dds/LivelinessQoS/CMakeLists.txt index 8bcc4e1cd85..6e9a89e4de7 100644 --- a/examples/cpp/dds/LivelinessQoS/CMakeLists.txt +++ b/examples/cpp/dds/LivelinessQoS/CMakeLists.txt @@ -12,7 +12,7 @@ # See the License for the specific language governing permissions and # limitations under the License. -cmake_minimum_required(VERSION 3.22) +cmake_minimum_required(VERSION 3.20) project(LivelinessQoS VERSION 1 LANGUAGES CXX) diff --git a/examples/cpp/dds/OwnershipStrengthQoSExample/CMakeLists.txt b/examples/cpp/dds/OwnershipStrengthQoSExample/CMakeLists.txt index cd2efd114c4..f26d31984dd 100644 --- a/examples/cpp/dds/OwnershipStrengthQoSExample/CMakeLists.txt +++ b/examples/cpp/dds/OwnershipStrengthQoSExample/CMakeLists.txt @@ -12,7 +12,7 @@ # See the License for the specific language governing permissions and # limitations under the License. -cmake_minimum_required(VERSION 3.22) +cmake_minimum_required(VERSION 3.20) project(OwnershipStrengthQoSExample VERSION 1 LANGUAGES CXX) diff --git a/examples/cpp/dds/RequestReplyExample/CMakeLists.txt b/examples/cpp/dds/RequestReplyExample/CMakeLists.txt index 1af4ae77aad..654db9d07b6 100644 --- a/examples/cpp/dds/RequestReplyExample/CMakeLists.txt +++ b/examples/cpp/dds/RequestReplyExample/CMakeLists.txt @@ -12,7 +12,7 @@ # See the License for the specific language governing permissions and # limitations under the License. -cmake_minimum_required(VERSION 3.22) +cmake_minimum_required(VERSION 3.20) project(RequestReplyExample VERSION 1 LANGUAGES CXX) diff --git a/examples/cpp/dds/SampleConfig_Controller/CMakeLists.txt b/examples/cpp/dds/SampleConfig_Controller/CMakeLists.txt index 1ea69cc0898..b806afaca8a 100644 --- a/examples/cpp/dds/SampleConfig_Controller/CMakeLists.txt +++ b/examples/cpp/dds/SampleConfig_Controller/CMakeLists.txt @@ -12,7 +12,7 @@ # See the License for the specific language governing permissions and # limitations under the License. -cmake_minimum_required(VERSION 3.22) +cmake_minimum_required(VERSION 3.20) project(SampleControllerConfig VERSION 1 LANGUAGES CXX) diff --git a/examples/cpp/dds/SampleConfig_Events/CMakeLists.txt b/examples/cpp/dds/SampleConfig_Events/CMakeLists.txt index b89e1b07d7d..58ce865c015 100644 --- a/examples/cpp/dds/SampleConfig_Events/CMakeLists.txt +++ b/examples/cpp/dds/SampleConfig_Events/CMakeLists.txt @@ -12,7 +12,7 @@ # See the License for the specific language governing permissions and # limitations under the License. -cmake_minimum_required(VERSION 3.22) +cmake_minimum_required(VERSION 3.20) project(SampleEventsConfig VERSION 1 LANGUAGES CXX) diff --git a/examples/cpp/dds/SampleConfig_Multimedia/CMakeLists.txt b/examples/cpp/dds/SampleConfig_Multimedia/CMakeLists.txt index 8f36bdf2937..19862018d38 100644 --- a/examples/cpp/dds/SampleConfig_Multimedia/CMakeLists.txt +++ b/examples/cpp/dds/SampleConfig_Multimedia/CMakeLists.txt @@ -12,7 +12,7 @@ # See the License for the specific language governing permissions and # limitations under the License. -cmake_minimum_required(VERSION 3.22) +cmake_minimum_required(VERSION 3.20) project(SampleMultimediaConfig VERSION 1 LANGUAGES CXX) diff --git a/examples/cpp/dds/SecureHelloWorldExample/CMakeLists.txt b/examples/cpp/dds/SecureHelloWorldExample/CMakeLists.txt index cd818be8a03..a06592719d7 100644 --- a/examples/cpp/dds/SecureHelloWorldExample/CMakeLists.txt +++ b/examples/cpp/dds/SecureHelloWorldExample/CMakeLists.txt @@ -12,7 +12,7 @@ # See the License for the specific language governing permissions and # limitations under the License. -cmake_minimum_required(VERSION 3.22) +cmake_minimum_required(VERSION 3.20) project(SecureHelloWorldExample VERSION 1 LANGUAGES CXX) diff --git a/examples/cpp/dds/StaticHelloWorldExample/CMakeLists.txt b/examples/cpp/dds/StaticHelloWorldExample/CMakeLists.txt index 6f01457872c..cbe65f36bc6 100644 --- a/examples/cpp/dds/StaticHelloWorldExample/CMakeLists.txt +++ b/examples/cpp/dds/StaticHelloWorldExample/CMakeLists.txt @@ -12,7 +12,7 @@ # See the License for the specific language governing permissions and # limitations under the License. -cmake_minimum_required(VERSION 3.22) +cmake_minimum_required(VERSION 3.20) project(StaticHelloWorldExample VERSION 1 LANGUAGES CXX) diff --git a/examples/cpp/dds/TypeLookupService/CMakeLists.txt b/examples/cpp/dds/TypeLookupService/CMakeLists.txt index 85c1cff82c8..b53eb6cdae0 100644 --- a/examples/cpp/dds/TypeLookupService/CMakeLists.txt +++ b/examples/cpp/dds/TypeLookupService/CMakeLists.txt @@ -12,7 +12,7 @@ # See the License for the specific language governing permissions and # limitations under the License. -cmake_minimum_required(VERSION 3.22) +cmake_minimum_required(VERSION 3.20) project(TypeLookupExample VERSION 1 LANGUAGES CXX) diff --git a/examples/cpp/dds/WriterLoansExample/CMakeLists.txt b/examples/cpp/dds/WriterLoansExample/CMakeLists.txt index 5ddface8ff6..4aceabc3907 100644 --- a/examples/cpp/dds/WriterLoansExample/CMakeLists.txt +++ b/examples/cpp/dds/WriterLoansExample/CMakeLists.txt @@ -12,7 +12,7 @@ # See the License for the specific language governing permissions and # limitations under the License. -cmake_minimum_required(VERSION 3.22) +cmake_minimum_required(VERSION 3.20) project(DDSWriterLoansExample VERSION 1 LANGUAGES CXX) diff --git a/examples/cpp/dds/ZeroCopyExample/CMakeLists.txt b/examples/cpp/dds/ZeroCopyExample/CMakeLists.txt index 595c23431cc..817e2028164 100644 --- a/examples/cpp/dds/ZeroCopyExample/CMakeLists.txt +++ b/examples/cpp/dds/ZeroCopyExample/CMakeLists.txt @@ -12,7 +12,7 @@ # See the License for the specific language governing permissions and # limitations under the License. -cmake_minimum_required(VERSION 3.22) +cmake_minimum_required(VERSION 3.20) project(DDSZeroCopyExample VERSION 1 LANGUAGES CXX) diff --git a/examples/cpp/rtps/AsSocket/CMakeLists.txt b/examples/cpp/rtps/AsSocket/CMakeLists.txt index 327c8877fa2..27e868d53f0 100644 --- a/examples/cpp/rtps/AsSocket/CMakeLists.txt +++ b/examples/cpp/rtps/AsSocket/CMakeLists.txt @@ -12,7 +12,7 @@ # See the License for the specific language governing permissions and # limitations under the License. -cmake_minimum_required(VERSION 3.22) +cmake_minimum_required(VERSION 3.20) project(RTPSTest_as_socket VERSION 1 LANGUAGES CXX) diff --git a/examples/cpp/rtps/Persistent/CMakeLists.txt b/examples/cpp/rtps/Persistent/CMakeLists.txt index 3904d09279d..0463dd49a79 100644 --- a/examples/cpp/rtps/Persistent/CMakeLists.txt +++ b/examples/cpp/rtps/Persistent/CMakeLists.txt @@ -12,7 +12,7 @@ # See the License for the specific language governing permissions and # limitations under the License. -cmake_minimum_required(VERSION 3.22) +cmake_minimum_required(VERSION 3.20) project(RTPSTest_persistent VERSION 1 LANGUAGES CXX) diff --git a/examples/cpp/rtps/Registered/CMakeLists.txt b/examples/cpp/rtps/Registered/CMakeLists.txt index 86331ed0c75..3cd10781e41 100644 --- a/examples/cpp/rtps/Registered/CMakeLists.txt +++ b/examples/cpp/rtps/Registered/CMakeLists.txt @@ -12,7 +12,7 @@ # See the License for the specific language governing permissions and # limitations under the License. -cmake_minimum_required(VERSION 3.22) +cmake_minimum_required(VERSION 3.20) project(RTPSTest_registered VERSION 1 LANGUAGES CXX) diff --git a/fuzz/C++/fuzz_XMLProfiles/CMakeLists.txt b/fuzz/C++/fuzz_XMLProfiles/CMakeLists.txt index 2573dfc1aa3..f40256d20a4 100644 --- a/fuzz/C++/fuzz_XMLProfiles/CMakeLists.txt +++ b/fuzz/C++/fuzz_XMLProfiles/CMakeLists.txt @@ -12,7 +12,7 @@ # See the License for the specific language governing permissions and # limitations under the License. -cmake_minimum_required(VERSION 3.22) +cmake_minimum_required(VERSION 3.20) project(fuzz_XMLProfiles VERSION 1 LANGUAGES CXX) diff --git a/fuzz/C++/fuzz_processCDRMsg/CMakeLists.txt b/fuzz/C++/fuzz_processCDRMsg/CMakeLists.txt index d840be97c21..0cf01c3bbd4 100644 --- a/fuzz/C++/fuzz_processCDRMsg/CMakeLists.txt +++ b/fuzz/C++/fuzz_processCDRMsg/CMakeLists.txt @@ -1,4 +1,4 @@ -cmake_minimum_required(VERSION 3.22) +cmake_minimum_required(VERSION 3.20) project(fuzz_processCDRMsg VERSION 1 LANGUAGES CXX) diff --git a/test/CMakeLists.txt b/test/CMakeLists.txt index 41332b834ae..2d12d3687fe 100644 --- a/test/CMakeLists.txt +++ b/test/CMakeLists.txt @@ -59,10 +59,10 @@ endif() # Profiling tests using valgrind ############################################################################### if(NOT ((MSVC OR MSVC_IDE)) AND PROFILING_TESTS) - find_program(CTEST_MEMORYCHECK_COMMAND NAMES valgrind) - if(CTEST_MEMORYCHECK_COMMAND) - add_subdirectory(profiling) - endif() + find_program(CTEST_MEMORYCHECK_COMMAND NAMES valgrind) + if(CTEST_MEMORYCHECK_COMMAND) + add_subdirectory(profiling) + endif() endif() ############################################################################### diff --git a/test/profiling/allocations/CMakeLists.txt b/test/profiling/allocations/CMakeLists.txt index 44217a019d9..8d67649d86f 100644 --- a/test/profiling/allocations/CMakeLists.txt +++ b/test/profiling/allocations/CMakeLists.txt @@ -12,7 +12,7 @@ # See the License for the specific language governing permissions and # limitations under the License. -cmake_minimum_required(VERSION 3.22) +cmake_minimum_required(VERSION 3.20) project(fastrtps_allocation_test VERSION 1 LANGUAGES CXX) diff --git a/test/unittest/cmake/force_cxx/CMakeLists.txt b/test/unittest/cmake/force_cxx/CMakeLists.txt index dc092e91622..c3e5c67eea1 100644 --- a/test/unittest/cmake/force_cxx/CMakeLists.txt +++ b/test/unittest/cmake/force_cxx/CMakeLists.txt @@ -15,7 +15,7 @@ ############################################################################### # Auxiliary project for check_configuration.cmake module testing ############################################################################### -cmake_minimum_required(VERSION 3.22) +cmake_minimum_required(VERSION 3.20) # setup option(TEST_FALLBACK "Ignore CMake builtin instrospection and use our original fallback" OFF) diff --git a/thirdparty/optionparser/CMakeLists.txt b/thirdparty/optionparser/CMakeLists.txt index b829c895d0d..6615873d050 100644 --- a/thirdparty/optionparser/CMakeLists.txt +++ b/thirdparty/optionparser/CMakeLists.txt @@ -12,7 +12,7 @@ # See the License for the specific language governing permissions and # limitations under the License. -cmake_minimum_required(VERSION 3.22) +cmake_minimum_required(VERSION 3.20) ##################################################################################### # Interface Library diff --git a/tools/fds/CMakeLists.txt b/tools/fds/CMakeLists.txt index 7881850dfc0..6d523d7628a 100644 --- a/tools/fds/CMakeLists.txt +++ b/tools/fds/CMakeLists.txt @@ -12,7 +12,7 @@ # See the License for the specific language governing permissions and # limitations under the License. -cmake_minimum_required(VERSION 3.22) +cmake_minimum_required(VERSION 3.20) project(fast-discovery-server VERSION 1.0.1 LANGUAGES CXX)