diff options
| author | Campbell Barton <ideasman42@gmail.com> | 2020-03-12 04:13:41 +0300 |
|---|---|---|
| committer | Campbell Barton <ideasman42@gmail.com> | 2020-03-12 04:13:41 +0300 |
| commit | 74855969e7b5fd8da71cc62057a0ce8eb3f528f8 (patch) | |
| tree | 477dd3f7f2d9a844a8273aa3cfc817d2c2f608d4 /extern | |
| parent | 8751af6d1902f7f81e3f5de5f71018b47ad099d9 (diff) | |
Cleanup: use term suppress instead of repress
Also check MSVC instead of WIN32, for setting MSVC flags.
Diffstat (limited to 'extern')
| -rw-r--r-- | extern/bullet2/CMakeLists.txt | 4 | ||||
| -rw-r--r-- | extern/glog/CMakeLists.txt | 8 |
2 files changed, 7 insertions, 5 deletions
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 |