Windows CI fix

Author: boybook

.github/workflows/build.yml

@@ -30,7 +30,7 @@ jobs:
             node_arch: arm64
             cmake_arch: arm64
 
-          # Windows builds
+          # Windows builds with MSVC
           - os: windows-latest
             arch: x64
             node_arch: x64
@@ -106,7 +106,7 @@ jobs:
           echo "Checking gfortran installation..."
           ls -la ${BREW_PREFIX}/bin/gfortran* || echo "gfortran not found"
           
-          # 找到正确的gfortran路径
+          # 找到正确的gfortran路径并设置为环境变量
           GFORTRAN_PATH=$(find ${BREW_PREFIX}/bin -name "gfortran*" | head -1)
           if [ -n "$GFORTRAN_PATH" ] && [ -x "$GFORTRAN_PATH" ]; then
             echo "Found gfortran at: $GFORTRAN_PATH"
@@ -124,42 +124,31 @@ jobs:
           echo "LIBRARY_PATH=${BREW_PREFIX}/lib:$LIBRARY_PATH" >> $GITHUB_ENV
           echo "LD_LIBRARY_PATH=${BREW_PREFIX}/lib:$LD_LIBRARY_PATH" >> $GITHUB_ENV
 
-      # 3. 安装系统依赖 - Windows
-      - name: Setup MSYS2 for Windows build
+      # 3. Windows MSVC 环境设置
+      - name: Setup Visual Studio Build Tools
         if: runner.os == 'Windows'
-        uses: msys2/setup-msys2@v2
-        with:
-          msystem: MINGW64
-          update: true
-          path-type: inherit
-          install: >-
-            mingw-w64-x86_64-gcc
-            mingw-w64-x86_64-gcc-fortran
-            mingw-w64-x86_64-cmake
-            mingw-w64-x86_64-ninja
-            mingw-w64-x86_64-pkg-config
-            mingw-w64-x86_64-fftw
-            mingw-w64-x86_64-boost
+        uses: microsoft/setup-msbuild@v1
 
-      - name: Setup Windows environment
+      - name: Setup vcpkg & install FFTW3
         if: runner.os == 'Windows'
-        shell: msys2 {0}
         run: |
-          echo "/c/msys64/mingw64/bin" >> $GITHUB_PATH
-          echo "Verifying pkg-config installation..."
-          which pkg-config || (echo "pkg-config not found, reinstalling..." && pacman -S --noconfirm mingw-w64-x86_64-pkg-config)
-          pkg-config --version || (echo "Unable to run pkg-config, reinstalling..." && pacman -S --noconfirm mingw-w64-x86_64-pkg-config)
+          git clone https://github.com/Microsoft/vcpkg.git
+          .\vcpkg\bootstrap-vcpkg.bat
+          
+          # 使用经典模式安装依赖包
+          .\vcpkg\vcpkg install fftw3f:x64-windows fftw3:x64-windows boost:x64-windows
           
-          echo "CC=gcc" >> $GITHUB_ENV
-          echo "CXX=g++" >> $GITHUB_ENV
-          echo "FC=gfortran" >> $GITHUB_ENV
-          echo "CMAKE_Fortran_COMPILER=gfortran" >> $GITHUB_ENV
-          echo "CMAKE_GENERATOR=MinGW Makefiles" >> $GITHUB_ENV
-      
-          gcc --version
-          g++ --version
-          gfortran --version
-          cmake --version
+          # 设置vcpkg环境变量
+          echo "VCPKG_ROOT=${{ github.workspace }}\vcpkg" >> $env:GITHUB_ENV
+          echo "CMAKE_TOOLCHAIN_FILE=${{ github.workspace }}\vcpkg\scripts\buildsystems\vcpkg.cmake" >> $env:GITHUB_ENV
+        shell: powershell
+
+      - name: Setup Intel Fortran
+        if: runner.os == 'Windows'
+        uses: fortran-lang/setup-fortran@v1
+        with:
+          compiler: intel-classic
+          version: '2021.10'
 
       # 4. 安装 npm 依赖
       - name: Install npm dependencies
@@ -173,6 +162,9 @@ jobs:
       - name: Build native module (Linux/macOS)
         if: runner.os != 'Windows'
         run: |
+          # 清理可能存在的CMake缓存
+          rm -rf build/
+          
           if [ "${{ matrix.arch }}" = "arm64" ] && [ "${{ runner.os }}" = "Linux" ]; then
             # Linux ARM64 交叉编译
             npx cmake-js compile --arch=${{ matrix.cmake_arch }} \
@@ -186,35 +178,20 @@ jobs:
             npx cmake-js compile --arch=${{ matrix.cmake_arch }}
           fi
 
-      # 6. 构建原生模块 - Windows
-      - name: Build native module (Windows)
+      # 6. 构建原生模块 - Windows MSVC
+      - name: Build native module (Windows MSVC)
         if: runner.os == 'Windows'
-        shell: msys2 {0}
         run: |
-          echo "--- Checking Node.js and npx in MSYS2 (with path-type: inherit) ---"
-          echo "PATH: $PATH"
-          
-          echo "which node:"
-          which node || echo "node not found"
-          echo "node --version:"
-          node --version || echo "node not runnable"
+          echo "--- Building with MSVC toolchain ---"
+          if (Test-Path "build") { Remove-Item -Recurse -Force "build" }
           
-          echo "which npx:"
-          which npx || echo "npx not found"
-          echo "npx --version:"
-          npx --version || echo "npx not runnable"
-          
-          echo "Attempting to run npx cmake-js compile..."
-          npx cmake-js compile --arch=${{ matrix.cmake_arch }} \
-            -G "MinGW Makefiles" \
-            --CDCMAKE_C_COMPILER=gcc \
-            --CDCMAKE_CXX_COMPILER=g++ \
-            --CDCMAKE_Fortran_COMPILER=gfortran \
-            --CDCMAKE_SHARED_LINKER_FLAGS='' \
-            --CDCMAKE_MODULE_LINKER_FLAGS='' \
-            --CDCMAKE_EXE_LINKER_FLAGS='' \
-            --CDCMAKE_JS_SRC='' \
+          npx cmake-js compile --arch=${{ matrix.cmake_arch }} `
+            -G "Visual Studio 17 2022" -A x64 `
+            --CDCMAKE_TOOLCHAIN_FILE="$env:CMAKE_TOOLCHAIN_FILE" `
+            --CDVCPKG_MANIFEST_MODE=OFF `
+            --CDVCPKG_MANIFEST_INSTALL=OFF `
             --verbose
+        shell: powershell
 
       # 7. 运行测试
       - name: Run tests
@@ -241,6 +218,7 @@ jobs:
             echo "❌ Basic test file not found!"
             exit 1
           fi
+        shell: bash
 
       # 8. 创建预构建二进制文件
       - name: Create prebuilt binaries

CMakeLists.txt

@@ -1,5 +1,20 @@
 cmake_minimum_required(VERSION 3.15)
-project(wsjtx_lib_nodejs)
+
+# 禁用 vcpkg Manifest 模式，使用经典模式
+if(DEFINED CMAKE_TOOLCHAIN_FILE AND CMAKE_TOOLCHAIN_FILE MATCHES "vcpkg")
+    set(VCPKG_MANIFEST_MODE OFF CACHE BOOL "Disable vcpkg manifest mode" FORCE)
+    set(VCPKG_MANIFEST_INSTALL OFF CACHE BOOL "Disable vcpkg manifest install" FORCE)
+    message(STATUS "Detected vcpkg toolchain, disabling manifest mode")
+endif()
+
+project(wsjtx_lib_nodejs LANGUAGES C CXX Fortran)
+
+# Use MSVC on Windows by default, else keep existing
+if(MSVC)
+    message(STATUS "Using MSVC toolchain on Windows")
+    # Enable Fortran support via Intel oneAPI if available
+    # vcpkg toolchain file should be passed to CMake invocation
+endif()
 
 # Set C++ standard
 set(CMAKE_CXX_STANDARD 17)
@@ -38,7 +53,9 @@ elseif(APPLE)
 endif()
 
 # Include cmake-js
-include_directories(${CMAKE_JS_INC})
+if(CMAKE_JS_INC)
+    include_directories(${CMAKE_JS_INC})
+endif()
 
 # Add Node.js include path for node_api.h
 execute_process(
@@ -49,7 +66,30 @@ execute_process(
 include_directories(${NODE_INCLUDE_DIR})
 
 # Platform-specific package finding
-if(WIN32)
+if(WIN32 AND MSVC)
+    # Windows with MSVC: Use vcpkg for FFTW3
+    find_package(FFTW3F CONFIG REQUIRED)
+    find_package(FFTW3 CONFIG REQUIRED)
+    
+    # Set CMake policy for newer Boost versions
+    if(POLICY CMP0167)
+        cmake_policy(SET CMP0167 NEW)
+    endif()
+    
+    # Find Boost
+    find_package(Boost QUIET)
+    if(Boost_FOUND)
+        message(STATUS "Boost found: ${Boost_VERSION}")
+        set(BOOST_LIBRARIES ${Boost_LIBRARIES})
+    else()
+        message(WARNING "Boost not found via find_package, continuing...")
+        set(BOOST_LIBRARIES "")
+    endif()
+    
+    # MSVC doesn't need separate threads library for FFTW
+    set(FFTW_HAS_THREADS FALSE)
+    set(FFTW_THREADS_LIBRARIES "")
+elseif(WIN32)
     # Windows with MSYS2: Use pkg-config like Unix systems
     find_package(PkgConfig REQUIRED)
 
@@ -111,19 +151,34 @@ else()
 endif()
 
 # Include directories
-include_directories(
-    ${CMAKE_SOURCE_DIR}/wsjtx_lib
-    ${CMAKE_SOURCE_DIR}/native
-    ${CMAKE_SOURCE_DIR}/node_modules/node-addon-api
-    ${FFTW3F_INCLUDE_DIRS}
-    ${Boost_INCLUDE_DIRS}
-)
+if(WIN32 AND MSVC)
+    include_directories(
+        ${CMAKE_SOURCE_DIR}/wsjtx_lib
+        ${CMAKE_SOURCE_DIR}/native
+        ${CMAKE_SOURCE_DIR}/node_modules/node-addon-api
+    )
+else()
+    include_directories(
+        ${CMAKE_SOURCE_DIR}/wsjtx_lib
+        ${CMAKE_SOURCE_DIR}/native
+        ${CMAKE_SOURCE_DIR}/node_modules/node-addon-api
+        ${FFTW3F_INCLUDE_DIRS}
+        ${Boost_INCLUDE_DIRS}
+    )
+endif()
 
 # Define LIBRARIES_FROM_REFERENCES for wsjtx_lib submodule
-set(LIBRARIES_FROM_REFERENCES 
-    ${FFTW3F_LIBRARIES}
-    ${FFTW_THREADS_LIBRARIES}
-)
+if(WIN32 AND MSVC)
+    set(LIBRARIES_FROM_REFERENCES 
+        FFTW3F::fftw3f
+        FFTW3::fftw3
+    )
+else()
+    set(LIBRARIES_FROM_REFERENCES 
+        ${FFTW3F_LIBRARIES}
+        ${FFTW_THREADS_LIBRARIES}
+    )
+endif()
 
 # Platform-specific library setup
 if(APPLE)
@@ -150,10 +205,7 @@ if(APPLE)
     if(GFORTRAN_EXECUTABLE)
         message(STATUS "Found gfortran: ${GFORTRAN_EXECUTABLE}")
 
-        # Set the Fortran compiler for the project
-        set(CMAKE_Fortran_COMPILER ${GFORTRAN_EXECUTABLE})
-        
-        # Get library path
+        # Get library path (but don't set CMAKE_Fortran_COMPILER here to avoid cache conflicts)
         execute_process(
             COMMAND ${GFORTRAN_EXECUTABLE} --print-file-name=libgfortran.dylib
             OUTPUT_VARIABLE GFORTRAN_LIB_PATH
@@ -203,7 +255,7 @@ elseif(UNIX)
     if(FFTW_HAS_THREADS)
         list(APPEND LIBRARIES_FROM_REFERENCES fftw3f_threads)
     endif()
-elseif(WIN32)
+elseif(WIN32 AND NOT MSVC)
     # Windows specific libraries - MSYS2/MinGW environment
     list(APPEND LIBRARIES_FROM_REFERENCES 
         gfortran 
@@ -216,8 +268,10 @@ endif()
 add_subdirectory(wsjtx_lib)
 
 # Link directories (must be before creating target)
-if(NOT WIN32)
-    link_directories(${FFTW3F_LIBRARY_DIRS})
+if(NOT WIN32 OR NOT MSVC)
+    if(NOT WIN32)
+        link_directories(${FFTW3F_LIBRARY_DIRS})
+    endif()
 endif()
 
 # Source files for the Node.js addon
@@ -231,7 +285,7 @@ if(MINGW)
         # Exclude CMAKE_JS_SRC for MinGW
     )
 else()
-    # For other platforms (or if not MINGW, though cmake-js might handle this differently)
+    # For other platforms (MSVC, Linux, macOS)
     add_library(${PROJECT_NAME} SHARED 
         ${NATIVE_SOURCES}
         ${CMAKE_JS_SRC}
@@ -247,7 +301,9 @@ set_target_properties(${PROJECT_NAME} PROPERTIES
 )
 
 # Set Node.js addon include directories
-target_include_directories(${PROJECT_NAME} PRIVATE ${CMAKE_JS_INC})
+if(CMAKE_JS_INC)
+    target_include_directories(${PROJECT_NAME} PRIVATE ${CMAKE_JS_INC})
+endif()
 
 # Compiler-specific options
 target_compile_definitions(${PROJECT_NAME} PRIVATE 
@@ -256,8 +312,10 @@ target_compile_definitions(${PROJECT_NAME} PRIVATE
 )
 
 # Add compile flags
-if(NOT WIN32)
-    target_compile_options(${PROJECT_NAME} PRIVATE ${FFTW3F_CFLAGS_OTHER})
+if(NOT WIN32 OR NOT MSVC)
+    if(NOT WIN32)
+        target_compile_options(${PROJECT_NAME} PRIVATE ${FFTW3F_CFLAGS_OTHER})
+    endif()
 endif()
 
 # Link libraries
@@ -267,6 +325,17 @@ if(MINGW)
         wsjtx_lib
         # Potentially add -lnode or the path to libnode.dll.a if needed
     )
+elseif(WIN32 AND MSVC)
+    # MSVC linking
+    if(CMAKE_JS_LIB)
+        target_link_libraries(${PROJECT_NAME} PRIVATE ${CMAKE_JS_LIB})
+    endif()
+    target_link_libraries(${PROJECT_NAME} PRIVATE
+        wsjtx_lib
+        FFTW3F::fftw3f
+        FFTW3::fftw3
+        ${BOOST_LIBRARIES}
+    )
 else()
     target_link_libraries(${PROJECT_NAME} 
         ${CMAKE_JS_LIB}
@@ -304,7 +373,7 @@ elseif(UNIX)
     target_link_options(${PROJECT_NAME} PRIVATE 
         -Wl,--as-needed
     )
-elseif(WIN32)
+elseif(WIN32 AND NOT MSVC)
     # Windows linking - MSYS2/MinGW environment
     target_link_libraries(${PROJECT_NAME} 
         ${FFTW3F_LIBRARIES}

package.json

@@ -23,6 +23,7 @@
   "scripts": {
     "build": "npm run build:native && npm run build:ts",
     "build:native": "cmake-js compile",
+    "build:native:win": "cmake-js compile -G \"Visual Studio 17 2022\" -A x64 --CDCMAKE_TOOLCHAIN_FILE=%VCPKG_ROOT%/scripts/buildsystems/vcpkg.cmake --CDVCPKG_MANIFEST_MODE=OFF --CDVCPKG_MANIFEST_INSTALL=OFF",
     "build:ts": "tsc",
     "clean": "cmake-js clean && rimraf dist",
     "test": "npm run build && node --test dist/test/wsjtx.basic.test.js",