diff options
| -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 |