Downgrade CMake minimum version to 3.20 (#4218)

* Refs #20176: downgrade cmake version Signed-off-by: JesusPoderoso <jesuspoderoso@eprosima.com> * Refs #20176: Require CMake minimum version 3.22 only for tests Signed-off-by: JesusPoderoso <jesuspoderoso@eprosima.com> * Refs #20176: Move test requirement to common function Signed-off-by: JesusPoderoso <jesuspoderoso@eprosima.com> * Refs #20176: Apply rev suggestions Signed-off-by: JesusPoderoso <jesuspoderoso@eprosima.com> --------- Signed-off-by: JesusPoderoso <jesuspoderoso@eprosima.com>
eProsima · Jan 10, 2024 · 69b3e6a · 69b3e6a
1 parent 454b578
commit 69b3e6a
Show file tree

Hide file tree

Showing 43 changed files with 46 additions and 45 deletions.
diff --git 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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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)