[Bf-blender-cvs] [74855969e7b] master: Cleanup: use term suppress instead of repress

Campbell Barton noreply at git.blender.org
Thu Mar 12 02:35:14 CET 2020


Commit: 74855969e7b5fd8da71cc62057a0ce8eb3f528f8
Author: Campbell Barton
Date:   Thu Mar 12 12:13:41 2020 +1100
Branches: master
https://developer.blender.org/rB74855969e7b5fd8da71cc62057a0ce8eb3f528f8

Cleanup: use term suppress instead of repress

Also check MSVC instead of WIN32, for setting MSVC flags.

===================================================================

M	extern/bullet2/CMakeLists.txt
M	extern/glog/CMakeLists.txt

===================================================================

diff --git a/extern/bullet2/CMakeLists.txt b/extern/bullet2/CMakeLists.txt
index 5f345c6a901..b386aa4035b 100644
--- a/extern/bullet2/CMakeLists.txt
+++ b/extern/bullet2/CMakeLists.txt
@@ -415,9 +415,9 @@ if(CMAKE_COMPILER_IS_GNUCXX)
   set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -fpermissive")
 endif()
 
-if(WIN32)
+if(MSVC)
   # bullet is responsible for quite a few silly warnings
-  # repress all of them. Not great, but they really needed
+  # suppress all of them. Not great, but they really needed
   # to sort that out themselves.
   set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} /W0")
 endif()
diff --git a/extern/glog/CMakeLists.txt b/extern/glog/CMakeLists.txt
index d7ad04435e8..bfe715d3463 100644
--- a/extern/glog/CMakeLists.txt
+++ b/extern/glog/CMakeLists.txt
@@ -77,9 +77,11 @@ if(WIN32)
   list(APPEND INC
     src/windows
   )
-  # Repress warning about google::LogMessageFatal::~LogMessageFatal
-  # not returning.
-  add_definitions("/wd4722")
+  if(MSVC)
+    # Suppress warning about google::LogMessageFatal::~LogMessageFatal
+    # not returning.
+    add_definitions("/wd4722")
+  endif()
 else()
   list(APPEND INC
     include



More information about the Bf-blender-cvs mailing list