mirror of https://github.com/ecmwf/eccodes.git
CMake: Attempt to fix broken CI workflow (clang@rocky-8.6) (part 2)
This commit is contained in:
parent
bf957dc013
commit
98e8126ae9
|
@ -77,8 +77,10 @@ if( CMAKE_CXX_COMPILER_ID STREQUAL "GNU" )
|
||||||
ecbuild_add_cxx_flags("-Wno-write-strings")
|
ecbuild_add_cxx_flags("-Wno-write-strings")
|
||||||
ecbuild_add_cxx_flags("-Wno-deprecated")
|
ecbuild_add_cxx_flags("-Wno-deprecated")
|
||||||
elseif (CMAKE_CXX_COMPILER_ID STREQUAL "Clang" OR CMAKE_CXX_COMPILER_ID STREQUAL "AppleClang")
|
elseif (CMAKE_CXX_COMPILER_ID STREQUAL "Clang" OR CMAKE_CXX_COMPILER_ID STREQUAL "AppleClang")
|
||||||
|
if(CMAKE_CXX_COMPILER_VERSION VERSION_LESS 16)
|
||||||
ecbuild_add_cxx_flags("-Wno-write-strings")
|
ecbuild_add_cxx_flags("-Wno-write-strings")
|
||||||
ecbuild_add_cxx_flags("-Wno-deprecated")
|
ecbuild_add_cxx_flags("-Wno-deprecated")
|
||||||
|
endif()
|
||||||
elseif( CMAKE_CXX_COMPILER_ID STREQUAL "Cray" )
|
elseif( CMAKE_CXX_COMPILER_ID STREQUAL "Cray" )
|
||||||
set(CMAKE_CXX_FLAGS "-hstd=c++11 ${CMAKE_CXX_FLAGS}")
|
set(CMAKE_CXX_FLAGS "-hstd=c++11 ${CMAKE_CXX_FLAGS}")
|
||||||
endif()
|
endif()
|
||||||
|
@ -480,10 +482,10 @@ endif()
|
||||||
|
|
||||||
###############################################################################
|
###############################################################################
|
||||||
# Debugging aid. Print all known CMake variables
|
# Debugging aid. Print all known CMake variables
|
||||||
# get_cmake_property(_variableNames VARIABLES)
|
#get_cmake_property(_variableNames VARIABLES)
|
||||||
# foreach( _variableName ${_variableNames} )
|
#foreach( _variableName ${_variableNames} )
|
||||||
# ecbuild_info(" ${_variableName}=${${_variableName}}")
|
# ecbuild_info(" ${_variableName}=${${_variableName}}")
|
||||||
# endforeach()
|
#endforeach()
|
||||||
###############################################################################
|
###############################################################################
|
||||||
# finalize
|
# finalize
|
||||||
|
|
||||||
|
|
Loading…
Reference in New Issue