aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorBrent Cook <busterb@gmail.com>2021-05-21 02:35:41 -0500
committerBrent Cook <busterb@gmail.com>2021-05-21 02:35:41 -0500
commitceb09a01f0c431ceb5bc075db493b1b8789c10b4 (patch)
tree167c0b9767551f96a920eaab4d8675cd162b4e74
parent31dc716df31fea5412f3bdb53caab09dec0c2050 (diff)
parent21ab73316fe56428b28ed53a2bd020cfa6924d6c (diff)
downloadportable-ceb09a01f0c431ceb5bc075db493b1b8789c10b4.tar.gz
portable-ceb09a01f0c431ceb5bc075db493b1b8789c10b4.tar.bz2
portable-ceb09a01f0c431ceb5bc075db493b1b8789c10b4.zip
Land #668, add clang-cl build support.
-rw-r--r--CMakeLists.txt3
1 files changed, 1 insertions, 2 deletions
diff --git a/CMakeLists.txt b/CMakeLists.txt
index 838b7e8..06d9186 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -113,7 +113,6 @@ if (CMAKE_COMPILER_IS_GNUCC OR CMAKE_C_COMPILER_ID MATCHES "Clang")
113endif() 113endif()
114 114
115if(WIN32) 115if(WIN32)
116 add_definitions(-Drestrict)
117 add_definitions(-D_CRT_SECURE_NO_WARNINGS) 116 add_definitions(-D_CRT_SECURE_NO_WARNINGS)
118 add_definitions(-D_CRT_DEPRECATED_NO_WARNINGS) 117 add_definitions(-D_CRT_DEPRECATED_NO_WARNINGS)
119 add_definitions(-D_REENTRANT -D_POSIX_THREAD_SAFE_FUNCTIONS) 118 add_definitions(-D_REENTRANT -D_POSIX_THREAD_SAFE_FUNCTIONS)
@@ -125,7 +124,7 @@ endif()
125if(MSVC) 124if(MSVC)
126 add_definitions(-Dinline=__inline) 125 add_definitions(-Dinline=__inline)
127 message(STATUS "Using [${CMAKE_C_COMPILER_ID}] compiler") 126 message(STATUS "Using [${CMAKE_C_COMPILER_ID}] compiler")
128 if(CMAKE_C_COMPILER_ID MATCHES "MSVC") 127 if(CMAKE_C_COMPILER_ID MATCHES "MSVC" OR CMAKE_C_COMPILER_ID MATCHES "Clang")
129 set(MSVC_DISABLED_WARNINGS_LIST 128 set(MSVC_DISABLED_WARNINGS_LIST
130 "C4018" # 'expression' : signed/unsigned mismatch 129 "C4018" # 'expression' : signed/unsigned mismatch
131 "C4057" # 'operator' : 'identifier1' indirection to 130 "C4057" # 'operator' : 'identifier1' indirection to