Microsoft build fixes - v0.3.0_4

Author: Vitruves

CMakeLists.txt

@@ -111,28 +111,40 @@ else()
 endif()
 
 # Try to find system lz4 first, fetch if not found
-find_package(PkgConfig QUIET)
-if(PkgConfig_FOUND)
-    pkg_check_modules(LZ4 QUIET liblz4)
+# Prefer CMake config (gives proper targets with full paths on all platforms)
+find_package(lz4 CONFIG QUIET)
+if(lz4_FOUND)
+    message(STATUS "Found lz4 via CMake config")
+    if(CARQUET_BUILD_SHARED AND TARGET LZ4::lz4_shared)
+        set(LZ4_LIBRARIES LZ4::lz4_shared)
+    elseif(TARGET LZ4::lz4_static)
+        set(LZ4_LIBRARIES LZ4::lz4_static)
+    elseif(TARGET LZ4::lz4_shared)
+        set(LZ4_LIBRARIES LZ4::lz4_shared)
+    elseif(TARGET lz4::lz4)
+        set(LZ4_LIBRARIES lz4::lz4)
+    endif()
+    # Only mark as found if we actually resolved a target
+    if(LZ4_LIBRARIES)
+        set(LZ4_FOUND TRUE)
+    else()
+        message(STATUS "lz4 CMake config found but no known target — trying pkg-config")
+        set(LZ4_FOUND FALSE)
+    endif()
 endif()
 
-if(LZ4_FOUND)
-    message(STATUS "Found system liblz4")
-else()
-    # Try CMake config (vcpkg, conda, etc.)
-    find_package(lz4 CONFIG QUIET)
-    if(lz4_FOUND)
-        message(STATUS "Found lz4 via CMake config")
-        if(CARQUET_BUILD_SHARED AND TARGET LZ4::lz4_shared)
-            set(LZ4_LIBRARIES LZ4::lz4_shared)
-        elseif(TARGET LZ4::lz4_static)
-            set(LZ4_LIBRARIES LZ4::lz4_static)
-        elseif(TARGET LZ4::lz4_shared)
-            set(LZ4_LIBRARIES LZ4::lz4_shared)
-        elseif(TARGET lz4::lz4)
-            set(LZ4_LIBRARIES lz4::lz4)
+if(NOT LZ4_FOUND)
+    find_package(PkgConfig QUIET)
+    if(PkgConfig_FOUND)
+        pkg_check_modules(LZ4 QUIET liblz4)
+        if(LZ4_FOUND)
+            message(STATUS "Found system liblz4 via pkg-config")
+            # Use LINK_LIBRARIES (full paths) instead of LIBRARIES (bare names)
+            # to avoid MSVC linker failing to locate the .lib file
+            if(LZ4_LINK_LIBRARIES)
+                set(LZ4_LIBRARIES ${LZ4_LINK_LIBRARIES})
+            endif()
         endif()
-        set(LZ4_FOUND TRUE)
     endif()
 endif()
 
@@ -407,7 +419,7 @@ endif()
 # Create library
 if(CARQUET_BUILD_SHARED)
     add_library(carquet SHARED ${CARQUET_SOURCES})
-    target_compile_definitions(carquet PRIVATE CARQUET_BUILD_SHARED)
+    target_compile_definitions(carquet PRIVATE CARQUET_BUILD_SHARED CARQUET_BUILDING_DLL)
 else()
     add_library(carquet STATIC ${CARQUET_SOURCES})
 endif()

src/simd/x86/avx2_ops.c

@@ -28,6 +28,7 @@ static inline int msvc_ctz(unsigned int x) {
     return (int)index;
 }
 #define __builtin_ctz(x) msvc_ctz(x)
+#define __builtin_popcount(x) __popcnt(x)
 #endif
 #include <immintrin.h>