Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

[20176] Downgrade cmake version #4218

Merged
merged 4 commits into from
Jan 10, 2024
Merged
Show file tree
Hide file tree
Changes from 3 commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -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)
Expand Down
1 change: 1 addition & 0 deletions cmake/testing/GoogleTest.cmake
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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)

Expand Down
2 changes: 1 addition & 1 deletion examples/cpp/dds/BasicConfigurationExample/CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -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)

Expand Down
2 changes: 1 addition & 1 deletion examples/cpp/dds/Configurability/CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -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)

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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)

Expand Down
2 changes: 1 addition & 1 deletion examples/cpp/dds/CustomListenerExample/CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -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)

Expand Down
2 changes: 1 addition & 1 deletion examples/cpp/dds/DeadlineQoSExample/CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -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)

Expand Down
2 changes: 1 addition & 1 deletion examples/cpp/dds/DisablePositiveACKs/CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -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)

Expand Down
2 changes: 1 addition & 1 deletion examples/cpp/dds/DiscoveryServerExample/CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -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)

Expand Down
2 changes: 1 addition & 1 deletion examples/cpp/dds/DynamicHelloWorldExample/CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -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)

Expand Down
2 changes: 1 addition & 1 deletion examples/cpp/dds/Filtering/CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -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)

Expand Down
2 changes: 1 addition & 1 deletion examples/cpp/dds/FlowControlExample/CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -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)

Expand Down
2 changes: 1 addition & 1 deletion examples/cpp/dds/HelloWorldExample/CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -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)

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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)

Expand Down
2 changes: 1 addition & 1 deletion examples/cpp/dds/HelloWorldExampleSharedMem/CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -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)

Expand Down
2 changes: 1 addition & 1 deletion examples/cpp/dds/HelloWorldExampleTCP/CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -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)

Expand Down
2 changes: 1 addition & 1 deletion examples/cpp/dds/HistoryKind/CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -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)

Expand Down
2 changes: 1 addition & 1 deletion examples/cpp/dds/Keys/CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -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)

Expand Down
2 changes: 1 addition & 1 deletion examples/cpp/dds/LateJoiners/CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -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)

Expand Down
2 changes: 1 addition & 1 deletion examples/cpp/dds/LifespanQoSExample/CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -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)

Expand Down
2 changes: 1 addition & 1 deletion examples/cpp/dds/LivelinessQoS/CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -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)

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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)

Expand Down
2 changes: 1 addition & 1 deletion examples/cpp/dds/RequestReplyExample/CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -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)

Expand Down
2 changes: 1 addition & 1 deletion examples/cpp/dds/SampleConfig_Controller/CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -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)

Expand Down
2 changes: 1 addition & 1 deletion examples/cpp/dds/SampleConfig_Events/CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -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)

Expand Down
2 changes: 1 addition & 1 deletion examples/cpp/dds/SampleConfig_Multimedia/CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -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)

Expand Down
2 changes: 1 addition & 1 deletion examples/cpp/dds/SecureHelloWorldExample/CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -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)

Expand Down
2 changes: 1 addition & 1 deletion examples/cpp/dds/StaticHelloWorldExample/CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -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)

Expand Down
2 changes: 1 addition & 1 deletion examples/cpp/dds/TypeLookupService/CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -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)

Expand Down
2 changes: 1 addition & 1 deletion examples/cpp/dds/WriterLoansExample/CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -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)

Expand Down
2 changes: 1 addition & 1 deletion examples/cpp/dds/ZeroCopyExample/CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -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)

Expand Down
2 changes: 1 addition & 1 deletion examples/cpp/rtps/AsSocket/CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -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)

Expand Down
2 changes: 1 addition & 1 deletion examples/cpp/rtps/Persistent/CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -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)

Expand Down
2 changes: 1 addition & 1 deletion examples/cpp/rtps/Registered/CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -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)

Expand Down
2 changes: 1 addition & 1 deletion fuzz/C++/fuzz_XMLProfiles/CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -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)

Expand Down
2 changes: 1 addition & 1 deletion fuzz/C++/fuzz_processCDRMsg/CMakeLists.txt
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
cmake_minimum_required(VERSION 3.22)
cmake_minimum_required(VERSION 3.20)

project(fuzz_processCDRMsg VERSION 1 LANGUAGES CXX)

Expand Down
8 changes: 4 additions & 4 deletions test/CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -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()

###############################################################################
Expand Down
2 changes: 1 addition & 1 deletion test/profiling/allocations/CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -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)

Expand Down
2 changes: 1 addition & 1 deletion test/unittest/cmake/force_cxx/CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -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)
Expand Down
2 changes: 1 addition & 1 deletion thirdparty/optionparser/CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion tools/fds/CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -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)

Expand Down