summaryrefslogtreecommitdiff
path: root/win
diff options
context:
space:
mode:
authorVladislav Vaintroub <wlad@mariadb.com>2020-05-18 11:00:28 +0000
committerVladislav Vaintroub <wlad@mariadb.com>2020-05-18 13:00:49 +0000
commit1f952df44a86efaaf5025403f388f9d2f018bd17 (patch)
tree72351e5155f42636a424f8e9da4c77fbf7ce14ef /win
parent9f8e5558955dacbd07972f9d96dfca802fab6a69 (diff)
downloadmariadb-git-1f952df44a86efaaf5025403f388f9d2f018bd17.tar.gz
MDEV-22612 Fix -DWITH_ASAN=1 on Windows.
Diffstat (limited to 'win')
-rw-r--r--win/upgrade_wizard/CMakeLists.txt10
1 files changed, 1 insertions, 9 deletions
diff --git a/win/upgrade_wizard/CMakeLists.txt b/win/upgrade_wizard/CMakeLists.txt
index 510f770b798..5a98ab15d0f 100644
--- a/win/upgrade_wizard/CMakeLists.txt
+++ b/win/upgrade_wizard/CMakeLists.txt
@@ -1,12 +1,4 @@
-IF(NOT MSVC)
- RETURN()
-ENDIF()
-IF(CMAKE_C_COMPILER_ID MATCHES Clang)
- # MFC stuff does not compile with clang
- RETURN()
-ENDIF()
-IF(CMAKE_USING_VC_FREE_TOOLS)
- # No MFC, so it cannot be built
+IF((NOT MSVC) OR CLANG_CL OR WITH_ASAN)
RETURN()
ENDIF()