Skip to content

Commit

Permalink
Merge branch 'eProsima:master' into wchar_de_fix
Browse files Browse the repository at this point in the history
  • Loading branch information
hwwei521 committed Jan 15, 2024
2 parents 7bbacba + 36da5a4 commit ece6aa4
Show file tree
Hide file tree
Showing 2 changed files with 3 additions and 3 deletions.
4 changes: 2 additions & 2 deletions CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@
###############################################################################
# CMake build rules for FastCDR #
###############################################################################
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 All @@ -35,7 +35,7 @@ endif()
###############################################################################
# Project #
###############################################################################
project(fastcdr VERSION 2.1.2 LANGUAGES CXX)
project(fastcdr VERSION 2.1.3 LANGUAGES CXX)

set(PROJECT_NAME_STYLED "FastCDR")
set(PROJECT_NAME_LARGE "Fast CDR")
Expand Down
2 changes: 1 addition & 1 deletion test/cmake/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

0 comments on commit ece6aa4

Please sign in to comment.