summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorVladislav Vaintroub <wlad@mariadb.com>2021-10-21 17:35:24 +0200
committerVladislav Vaintroub <wlad@mariadb.com>2021-10-21 18:42:29 +0200
commitccd3669b5ae0a0d98b3d54bef95f24cb24c71102 (patch)
tree3bf2b0d4d7a6e390d8b5404d56643162059addc3
parentf9b856b0525dd9d82a9b42be690a26a295c73c64 (diff)
downloadmariadb-git-bb-10.3-wlad.tar.gz
Do not run GCC specific tests on MSVCbb-10.3-wlad
-rw-r--r--configure.cmake7
1 files changed, 4 insertions, 3 deletions
diff --git a/configure.cmake b/configure.cmake
index db8742bb93b..bd04c278a78 100644
--- a/configure.cmake
+++ b/configure.cmake
@@ -863,7 +863,7 @@ SET(SIGNAL_WITH_VIO_CLOSE 1)
MARK_AS_ADVANCED(NO_ALARM)
-
+IF(NOT MSVC)
CHECK_CXX_SOURCE_COMPILES("
int main()
{
@@ -897,7 +897,7 @@ int main()
}"
HAVE_GCC_C11_ATOMICS_WITHOUT_LIBATOMIC)
IF (HAVE_GCC_C11_ATOMICS_WITHOUT_LIBATOMIC)
- SET(HAVE_GCC_C11_ATOMICS True)
+ SET(HAVE_GCC_C11_ATOMICS TRUE)
ELSE()
SET(OLD_CMAKE_REQUIRED_LIBRARIES ${CMAKE_REQUIRED_LIBRARIES})
LIST(APPEND CMAKE_REQUIRED_LIBRARIES "atomic")
@@ -910,10 +910,11 @@ ELSE()
}"
HAVE_GCC_C11_ATOMICS_WITH_LIBATOMIC)
IF(HAVE_GCC_C11_ATOMICS_WITH_LIBATOMIC)
- SET(HAVE_GCC_C11_ATOMICS True)
+ SET(HAVE_GCC_C11_ATOMICS TRUE)
ENDIF()
SET(CMAKE_REQUIRED_LIBRARIES ${OLD_CMAKE_REQUIRED_LIBRARIES})
ENDIF()
+ENDIF()
IF(WITH_VALGRIND)
SET(HAVE_valgrind 1)