Skip to content

Commit

Permalink
Merge branch 'hotfix/3.8.2'
Browse files Browse the repository at this point in the history
* hotfix/3.8.2:
  Version 3.8.2
  Avoid warning of deprecated cmake 3.5 by removing mention of cmake 3.3
  • Loading branch information
wdeconinck committed Dec 11, 2023
2 parents b6c74f6 + 9652fd2 commit a1b6fe0
Show file tree
Hide file tree
Showing 2 changed files with 1 addition and 12 deletions.
2 changes: 1 addition & 1 deletion cmake/VERSION
Original file line number Diff line number Diff line change
@@ -1 +1 @@
3.8.1
3.8.2
11 changes: 0 additions & 11 deletions cmake/ecbuild_project.cmake
Original file line number Diff line number Diff line change
Expand Up @@ -40,10 +40,6 @@ macro( project _project_name )
ecbuild_critical("Please specify a version for project ${_project_name}")
endif()

cmake_policy(PUSH)
cmake_minimum_required(VERSION 3.3 FATAL_ERROR) # for using IN_LIST
cmake_policy(SET CMP0057 NEW) # for using IN_LIST

unset( _require_LANGUAGES )
foreach( _lang C CXX Fortran )
if( ${_lang} IN_LIST _ecbuild_${_project_name}_UNPARSED_ARGUMENTS )
Expand All @@ -61,8 +57,6 @@ macro( project _project_name )
list( INSERT _ecbuild_${_project_name}_UNPARSED_ARGUMENTS 0 "LANGUAGES" )
endif()

cmake_policy(POP)

if( ${_project_name}_VERSION_STR )
cmake_policy(SET CMP0048 NEW )
_project( ${_project_name} VERSION ${${_project_name}_VERSION} ${_ecbuild_${_project_name}_UNPARSED_ARGUMENTS} )
Expand All @@ -82,9 +76,6 @@ macro( project _project_name )
ecbuild_debug( "CMake project(${_project_name}) ")

if(ECBUILD_2_COMPAT)
cmake_policy(PUSH)
cmake_minimum_required(VERSION 3.3 FATAL_ERROR) # for using IN_LIST
cmake_policy(SET CMP0057 NEW) # for using IN_LIST

unset( _args )
foreach( arg ${ARGN} )
Expand All @@ -97,8 +88,6 @@ macro( project _project_name )
set(_cmp0048_val OLD)
endif()

cmake_policy(POP)

cmake_policy(SET CMP0048 ${_cmp0048_val} )
unset(_cmp0048_val)
endif()
Expand Down

0 comments on commit a1b6fe0

Please sign in to comment.