Merge branch 'master' of https://github.com/flatironinstitute/finufft

Author: ahbarnett

.github/workflows/python_wheel.yml

@@ -186,12 +186,9 @@ jobs:
 
     steps:
     - uses: actions/checkout@v4
-    - uses: git-for-windows/setup-git-for-windows-sdk
-      with:
-        flavor: minimal
 
     - name: Install GCC and make
-      run: C:\msys64\usr\bin\bash.exe -lc "pacman -Sy --noconfirm make mingw-w64-x86_64-toolchain mingw-w64-x86_64-fftw"
+      run: C:\msys64\usr\bin\bash.exe -lc "pacman -Sy --noconfirm make mingw-w64-x86_64-toolchain mingw-w64-x86_64-fftw git"
 
     - name: Build and Test Python 3.8
       uses: actions/setup-python@v5

CMakeLists.txt

@@ -161,6 +161,8 @@ function(set_finufft_options target)
         target_include_directories(${target} PUBLIC ${FFTW_INCLUDE_DIR})
     endif ()
 
+    # XSIMD is a header only library, so we just need to include the headers
+    target_include_directories(${target} PUBLIC ${XSIMD_INCLUDE_DIR})
 endfunction()
 
 if (FINUFFT_USE_CPU)

cmake/setupXSIMD.cmake

@@ -1,5 +1,5 @@
 CPMAddPackage(
-        NAME findxtl
+        NAME xtl
         GIT_REPOSITORY "https://github.com/xtensor-stack/xtl.git"
         GIT_TAG ${XTL_VERSION}
         EXCLUDE_FROM_ALL YES
@@ -8,7 +8,7 @@ CPMAddPackage(
 )
 
 CPMAddPackage(
-        NAME findxsimd
+        NAME xsimd
         GIT_REPOSITORY "https://github.com/xtensor-stack/xsimd.git"
         GIT_TAG ${XSIMD_VERSION}
         EXCLUDE_FROM_ALL YES
@@ -17,3 +17,6 @@ CPMAddPackage(
             "XSIMD_SKIP_INSTALL YES"
             "XSIMD_ENABLE_XTL_COMPLEX YES"
 )
+
+get_property(XSIMD_SOURCE_DIR TARGET xsimd PROPERTY SOURCE_DIR)
+set(XSIMD_INCLUDE_DIR ${XSIMD_SOURCE_DIR}/include)