Merge branch 'blender-v4.0-release'
This commit is contained in:
commit
a03b1e5df5
@ -733,8 +733,8 @@ endmacro()
|
|||||||
# when we have warnings as errors applied globally this
|
# when we have warnings as errors applied globally this
|
||||||
# needs to be removed for some external libs which we don't maintain.
|
# needs to be removed for some external libs which we don't maintain.
|
||||||
|
|
||||||
# utility macro
|
|
||||||
macro(remove_cc_flag
|
macro(remove_c_flag
|
||||||
_flag)
|
_flag)
|
||||||
|
|
||||||
foreach(f ${ARGV})
|
foreach(f ${ARGV})
|
||||||
@ -743,7 +743,14 @@ macro(remove_cc_flag
|
|||||||
string(REGEX REPLACE ${f} "" CMAKE_C_FLAGS_RELEASE ${CMAKE_C_FLAGS_RELEASE})
|
string(REGEX REPLACE ${f} "" CMAKE_C_FLAGS_RELEASE ${CMAKE_C_FLAGS_RELEASE})
|
||||||
string(REGEX REPLACE ${f} "" CMAKE_C_FLAGS_MINSIZEREL ${CMAKE_C_FLAGS_MINSIZEREL})
|
string(REGEX REPLACE ${f} "" CMAKE_C_FLAGS_MINSIZEREL ${CMAKE_C_FLAGS_MINSIZEREL})
|
||||||
string(REGEX REPLACE ${f} "" CMAKE_C_FLAGS_RELWITHDEBINFO ${CMAKE_C_FLAGS_RELWITHDEBINFO})
|
string(REGEX REPLACE ${f} "" CMAKE_C_FLAGS_RELWITHDEBINFO ${CMAKE_C_FLAGS_RELWITHDEBINFO})
|
||||||
|
endforeach()
|
||||||
|
unset(f)
|
||||||
|
endmacro()
|
||||||
|
|
||||||
|
macro(remove_cxx_flag
|
||||||
|
_flag)
|
||||||
|
|
||||||
|
foreach(f ${ARGV})
|
||||||
string(REGEX REPLACE ${f} "" CMAKE_CXX_FLAGS ${CMAKE_CXX_FLAGS})
|
string(REGEX REPLACE ${f} "" CMAKE_CXX_FLAGS ${CMAKE_CXX_FLAGS})
|
||||||
string(REGEX REPLACE ${f} "" CMAKE_CXX_FLAGS_DEBUG ${CMAKE_CXX_FLAGS_DEBUG})
|
string(REGEX REPLACE ${f} "" CMAKE_CXX_FLAGS_DEBUG ${CMAKE_CXX_FLAGS_DEBUG})
|
||||||
string(REGEX REPLACE ${f} "" CMAKE_CXX_FLAGS_RELEASE ${CMAKE_CXX_FLAGS_RELEASE})
|
string(REGEX REPLACE ${f} "" CMAKE_CXX_FLAGS_RELEASE ${CMAKE_CXX_FLAGS_RELEASE})
|
||||||
@ -751,7 +758,14 @@ macro(remove_cc_flag
|
|||||||
string(REGEX REPLACE ${f} "" CMAKE_CXX_FLAGS_RELWITHDEBINFO ${CMAKE_CXX_FLAGS_RELWITHDEBINFO})
|
string(REGEX REPLACE ${f} "" CMAKE_CXX_FLAGS_RELWITHDEBINFO ${CMAKE_CXX_FLAGS_RELWITHDEBINFO})
|
||||||
endforeach()
|
endforeach()
|
||||||
unset(f)
|
unset(f)
|
||||||
|
endmacro()
|
||||||
|
|
||||||
|
# utility macro
|
||||||
|
macro(remove_cc_flag
|
||||||
|
_flag)
|
||||||
|
|
||||||
|
remove_c_flag(${ARGV})
|
||||||
|
remove_cxx_flag(${ARGV})
|
||||||
endmacro()
|
endmacro()
|
||||||
|
|
||||||
macro(add_c_flag
|
macro(add_c_flag
|
||||||
|
2
extern/fmtlib/CMakeLists.txt
vendored
2
extern/fmtlib/CMakeLists.txt
vendored
@ -5,6 +5,8 @@
|
|||||||
if(CMAKE_COMPILER_IS_GNUCC)
|
if(CMAKE_COMPILER_IS_GNUCC)
|
||||||
# NOTE: Resolved up-stream, quiet noisy compiler warnings for now.
|
# NOTE: Resolved up-stream, quiet noisy compiler warnings for now.
|
||||||
add_cxx_flag("-Wno-uninitialized")
|
add_cxx_flag("-Wno-uninitialized")
|
||||||
|
# Needed as build-type options may be added after the CXX flag added above.
|
||||||
|
remove_cxx_flag("-Wuninitialized")
|
||||||
endif()
|
endif()
|
||||||
|
|
||||||
set(INC
|
set(INC
|
||||||
|
Loading…
Reference in New Issue
Block a user