Skip to content

Commit f29b859

Browse files
committed
d
1 parent 6a57464 commit f29b859

File tree

2 files changed

+11
-17
lines changed

2 files changed

+11
-17
lines changed

CMakeLists.txt

Lines changed: 11 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -20,6 +20,17 @@ set(CMAKE_CXX_STANDARD_REQUIRED ON)
2020

2121
set_property(GLOBAL PROPERTY GLOBAL_DEPENDS_NO_CYCLES ON)
2222

23+
# Determine project compiler.
24+
if(CMAKE_CXX_COMPILER_ID STREQUAL "MSVC")
25+
set(IS_MSVC TRUE)
26+
endif()
27+
if(CMAKE_CXX_COMPILER_ID STREQUAL "GNU")
28+
set(IS_GNU TRUE)
29+
endif()
30+
if(CMAKE_CXX_COMPILER_ID MATCHES ".*Clang")
31+
set(IS_CLANG TRUE)
32+
endif()
33+
2334
include(cmake/FindDependencies.cmake)
2435

2536
if (TESTS_ENABLED)

glomap/thirdparty/CMakeLists.txt

Lines changed: 0 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -1,38 +1,21 @@
1-
# Determine project compiler.
2-
if(CMAKE_CXX_COMPILER_ID STREQUAL "MSVC")
3-
set(IS_MSVC TRUE)
4-
endif()
5-
if(CMAKE_CXX_COMPILER_ID STREQUAL "GNU")
6-
set(IS_GNU TRUE)
7-
endif()
8-
if(CMAKE_CXX_COMPILER_ID MATCHES ".*Clang")
9-
set(IS_CLANG TRUE)
10-
endif()
11-
121
# Only show moderate warnings for external library code.
132
if(IS_MSVC)
143
if(CMAKE_CXX_FLAGS MATCHES "/W[0-4]")
154
string(REGEX REPLACE "/W[0-4]" "" CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS}")
16-
set(REMOVED_WARNING_LEVEL TRUE)
175
elseif(CMAKE_CXX_FLAGS MATCHES "/Wall")
186
string(REGEX REPLACE "/Wall" "" CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS}")
19-
set(REMOVED_WARNING_LEVEL TRUE)
207
endif()
218
if(CMAKE_C_FLAGS MATCHES "/W[0-4]")
229
string(REGEX REPLACE "/W[0-4]" "" CMAKE_C_FLAGS "${CMAKE_C_FLAGS}")
23-
set(REMOVED_WARNING_LEVEL TRUE)
2410
elseif(CMAKE_C_FLAGS MATCHES "/Wall")
2511
string(REGEX REPLACE "/Wall" "" CMAKE_C_FLAGS "${CMAKE_C_FLAGS}")
26-
set(REMOVED_WARNING_LEVEL TRUE)
2712
endif()
2813
elseif(IS_GNU OR IS_CLANG)
2914
if(CMAKE_CXX_FLAGS MATCHES "-Wall")
3015
string(REGEX REPLACE "-Wall" "" CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS}")
31-
set(REMOVED_WARNING_LEVEL TRUE)
3216
endif()
3317
if(CMAKE_C_FLAGS MATCHES "-Wall")
3418
string(REGEX REPLACE "-Wall" "" CMAKE_C_FLAGS "${CMAKE_C_FLAGS}")
35-
set(REMOVED_WARNING_LEVEL TRUE)
3619
endif()
3720
endif()
3821

0 commit comments

Comments
 (0)