Fix win32 build

ClickHouse · Oct 2, 2024 · 7fd05c6 · 7fd05c6
1 parent a91cf26
commit 7fd05c6
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 2 deletions.
diff --git a/cmake/os.cmake b/cmake/os.cmake
@@ -19,6 +19,11 @@ elseif (CMAKE_SYSTEM_NAME MATCHES "SunOS")
     set (OS_SUNOS 1)
     add_definitions(-D OS_SUNOS)
 elseif (CMAKE_SYSTEM_NAME MATCHES "Windows")
+    if(NOT "${CMAKE_GENERATOR}" MATCHES "(Win64|IA64)")
+        set(WINDOWS_32 1)
+        MESSAGE(STATUS "WIN32")
+    endif()
+
     set (OS_WINDOWS 1)
     add_definitions(-D OS_WINDOWS)
 else ()

diff --git a/contrib/zlib-ng-cmake/CMakeLists.txt b/contrib/zlib-ng-cmake/CMakeLists.txt
@@ -18,8 +18,9 @@ elseif (OS_WINDOWS)
 endif()
 
 add_definitions(-DHAVE_BUILTIN_CTZ)
-add_definitions(-DHAVE_BUILTIN_CTZLL)
-
+if (NOT WINDOWS_32)
+    add_definitions(-DHAVE_BUILTIN_CTZLL)
+endif()
 
 set(ZLIB_ARCH_SRCS)
 set(ZLIB_ARCH_HDRS)