summaryrefslogtreecommitdiff
path: root/cmake
diff options
context:
space:
mode:
authorVladislav Vaintroub <wlad@mariadb.com>2020-09-27 01:01:41 +0200
committerVladislav Vaintroub <wlad@mariadb.com>2020-09-27 01:02:22 +0200
commitd111e6ae0cef102cd5698d8ed17ee123f77b9791 (patch)
treebcb0840ab3174792e7162e7521dd6fe5cfc67177 /cmake
parentd34523faee248c71d1e335a75977cc71debe67d9 (diff)
downloadmariadb-git-d111e6ae0cef102cd5698d8ed17ee123f77b9791.tar.gz
Fix clang-cl build
Diffstat (limited to 'cmake')
-rw-r--r--cmake/os/Windows.cmake6
1 files changed, 5 insertions, 1 deletions
diff --git a/cmake/os/Windows.cmake b/cmake/os/Windows.cmake
index 189253c5b23..1383a717bdc 100644
--- a/cmake/os/Windows.cmake
+++ b/cmake/os/Windows.cmake
@@ -104,7 +104,8 @@ MACRO(ENABLE_SANITIZERS)
STRING(APPEND CMAKE_C_STANDARD_LIBRARIES " \"${${lib}_fullpath}\" ")
STRING(APPEND CMAKE_CXX_STANDARD_LIBRARIES " \"${${lib}_fullpath}\" ")
ENDFOREACH()
-
+ STRING(APPEND CMAKE_C_FLAGS ${SANITIZER_COMPILE_FLAGS})
+ STRING(APPEND CMAKE_CXX_FLAGS ${SANITIZER_COMPILE_FLAGS})
ENDMACRO()
@@ -178,6 +179,9 @@ IF(MSVC)
-Wno-deprecated-register -Wno-missing-braces \
-Wno-unused-function -Wno-unused-local-typedef -msse4.2 "
)
+ IF(CMAKE_SIZEOF_VOID_P MATCHES 8)
+ STRING(APPEND CLANG_CL_FLAGS "-mpclmul ")
+ ENDIF()
STRING(APPEND CMAKE_C_FLAGS " ${CLANG_CL_FLAGS} ${MSVC_CRT_TYPE}")
STRING(APPEND CMAKE_CXX_FLAGS " ${CLANG_CL_FLAGS} ${MSVC_CRT_TYPE}")
ENDIF()