Welcome to mirror list, hosted at ThFree Co, Russian Federation.

git.blender.org/blender.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
path: root/source
diff options
context:
space:
mode:
authorAnkit Meel <ankitjmeel@gmail.com>2021-04-23 23:25:49 +0300
committerAnkit Meel <ankitjmeel@gmail.com>2021-04-23 23:25:49 +0300
commit17fca62fff9b5a6fa27fdf1d770b4e0315fa9448 (patch)
treeac2bb042683b1e81a71fa17f7d8913f75195dc4a /source
parent2e513afe803d7388210516895aeb8f8d8fd73ccc (diff)
parentaa95f8019e4204ea50210add1b2c2ed1934b92c9 (diff)
Merge branch 'blender-v2.93-release' into master
Diffstat (limited to 'source')
-rw-r--r--source/blender/compositor/CMakeLists.txt2
-rw-r--r--source/blender/gpu/CMakeLists.txt2
2 files changed, 2 insertions, 2 deletions
diff --git a/source/blender/compositor/CMakeLists.txt b/source/blender/compositor/CMakeLists.txt
index 75e7408b0a0..65391794c12 100644
--- a/source/blender/compositor/CMakeLists.txt
+++ b/source/blender/compositor/CMakeLists.txt
@@ -608,7 +608,7 @@ endif()
blender_add_lib(bf_compositor "${SRC}" "${INC}" "${INC_SYS}" "${LIB}")
-if(CMAKE_COMPILER_IS_GNUCC OR CMAKE_C_COMPILER_ID MATCHES "Clang")
+if(CXX_WARN_NO_SUGGEST_OVERRIDE)
target_compile_options(bf_compositor PRIVATE "-Wsuggest-override")
endif()
diff --git a/source/blender/gpu/CMakeLists.txt b/source/blender/gpu/CMakeLists.txt
index 923426c21a6..2ff72266a64 100644
--- a/source/blender/gpu/CMakeLists.txt
+++ b/source/blender/gpu/CMakeLists.txt
@@ -381,7 +381,7 @@ endif()
blender_add_lib(bf_gpu "${SRC}" "${INC}" "${INC_SYS}" "${LIB}")
-if(CMAKE_COMPILER_IS_GNUCC OR CMAKE_C_COMPILER_ID MATCHES "Clang")
+if(CXX_WARN_NO_SUGGEST_OVERRIDE)
target_compile_options(bf_gpu PRIVATE $<$<COMPILE_LANGUAGE:CXX>:-Wsuggest-override>)
endif()