ci fix3

Author: boybook

.github/workflows/build.yml

@@ -134,7 +134,7 @@ jobs:
         run: |
           git clone https://github.com/Microsoft/vcpkg.git
           .\vcpkg\bootstrap-vcpkg.bat
-          .\vcpkg\vcpkg install fftw3:x64-windows boost:x64-windows
+          .\vcpkg\vcpkg install fftw3[core]:x64-windows boost:x64-windows
         shell: cmd
 
       - name: Setup Intel Fortran
@@ -148,28 +148,22 @@ jobs:
         if: runner.os == 'Windows'
         run: |
           echo "=== Verifying Intel Fortran installation ==="
-          echo "PATH: %PATH%"
           echo "Checking for ifort..."
           where ifort || echo "ifort not found in PATH"
           echo "Checking for ifx..."
           where ifx || echo "ifx not found in PATH"
           
-          echo "Trying to run ifort (Windows style)..."
-          ifort /help | findstr "Intel" || echo "ifort help failed"
-          echo "Trying to run ifx (Windows style)..."
-          ifx /help | findstr "Intel" || echo "ifx help failed"
-          
-          echo "Setting environment variables..."
+          echo "Setting up Intel oneAPI environment..."
           if exist "C:\Program Files (x86)\Intel\oneAPI\setvars.bat" (
-            echo "Found Intel oneAPI setvars.bat"
+            echo "Calling Intel oneAPI setvars.bat..."
             call "C:\Program Files (x86)\Intel\oneAPI\setvars.bat"
           ) else (
             echo "Intel oneAPI setvars.bat not found"
           )
           
-          echo "Re-checking after setvars..."
-          where ifort && echo "ifort found" || echo "ifort still not found"
-          where ifx && echo "ifx found" || echo "ifx still not found"
+          echo "Final check - Fortran compilers available:"
+          where ifort && echo "✅ ifort ready" || echo "❌ ifort not available"
+          where ifx && echo "✅ ifx ready" || echo "❌ ifx not available"
         shell: cmd
 
       # 4. 安装 npm 依赖
@@ -212,20 +206,51 @@ jobs:
             call "C:\Program Files (x86)\Intel\oneAPI\setvars.bat"
           )
           
-          echo "Verifying Fortran compiler after environment setup..."
+          echo "Setting up MSVC environment..."
+          call "C:\Program Files\Microsoft Visual Studio\2022\Enterprise\VC\Auxiliary\Build\vcvars64.bat"
+          
+          echo "Verifying compilers after environment setup..."
+          where cl && echo "MSVC cl available" || echo "MSVC cl not available"
           where ifort && echo "ifort available" || echo "ifort not available"
           where ifx && echo "ifx available" || echo "ifx not available"
           
           echo "Cleaning build directory..."
           rmdir /s /q build 2>nul || echo "No build directory to clean"
           
-          echo "Starting cmake-js compilation..."
-          set IFORT_PATH=C:\Program Files (x86)\Intel\oneAPI\compiler\latest\windows\bin\intel64\ifort.exe
+          echo "Starting cmake-js compilation with NMake..."
+          set "IFORT_PATH=C:/Program Files (x86)/Intel/oneAPI/compiler/latest/windows/bin/intel64/ifort.exe"
+          
+          echo "Finding MSVC cl.exe..."
+          for /f "delims=" %%i in ('where cl') do set "MSVC_CL_PATH=%%i"
+          echo "Found MSVC cl.exe at: %MSVC_CL_PATH%"
+          
+          echo "Temporarily renaming Node.js rc to avoid conflicts..."
+          if exist "node_modules\.bin\rc.exe" (
+            ren "node_modules\.bin\rc.exe" "rc.exe.bak"
+            echo "Renamed node_modules\.bin\rc.exe to rc.exe.bak"
+          )
+          if exist "node_modules\.bin\rc" (
+            ren "node_modules\.bin\rc" "rc.bak"
+            echo "Renamed node_modules\.bin\rc to rc.bak"
+          )
+          
           npx cmake-js compile --arch=${{ matrix.cmake_arch }} ^
-            -G "Visual Studio 17 2022" -A x64 ^
-            --CDCMAKE_TOOLCHAIN_FILE=vcpkg\scripts\buildsystems\vcpkg.cmake ^
+            -G "NMake Makefiles" ^
+            --CDCMAKE_TOOLCHAIN_FILE=vcpkg/scripts/buildsystems/vcpkg.cmake ^
+            --CDCMAKE_C_COMPILER="%MSVC_CL_PATH%" ^
+            --CDCMAKE_CXX_COMPILER="%MSVC_CL_PATH%" ^
             --CDCMAKE_Fortran_COMPILER="%IFORT_PATH%" ^
             --verbose
+          
+          echo "Restoring Node.js rc tools..."
+          if exist "node_modules\.bin\rc.exe.bak" (
+            ren "node_modules\.bin\rc.exe.bak" "rc.exe"
+            echo "Restored node_modules\.bin\rc.exe"
+          )
+          if exist "node_modules\.bin\rc.bak" (
+            ren "node_modules\.bin\rc.bak" "rc"
+            echo "Restored node_modules\.bin\rc"
+          )
         shell: cmd
 
       # 7. 运行测试

CMakeLists.txt

@@ -10,34 +10,67 @@ 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
+if(WIN32)
+    message(STATUS "Windows platform detected")
 
-    # Try to find Intel Fortran compiler
+    # Force use of MSVC compilers for C/C++, Intel for Fortran only
+    if(NOT CMAKE_C_COMPILER)
+        find_program(MSVC_C_COMPILER
+            NAMES cl.exe
+            PATHS
+                "C:/Program Files/Microsoft Visual Studio/2022/Enterprise/VC/Tools/MSVC/*/bin/Hostx64/x64"
+                "C:/Program Files/Microsoft Visual Studio/2022/Community/VC/Tools/MSVC/*/bin/Hostx64/x64"
+                "C:/Program Files/Microsoft Visual Studio/2022/Professional/VC/Tools/MSVC/*/bin/Hostx64/x64"
+                "C:/Program Files (x86)/Microsoft Visual Studio/*/VC/Tools/MSVC/*/bin/Hostx64/x64"
+            DOC "MSVC C Compiler"
+        )
+        if(MSVC_C_COMPILER)
+            set(CMAKE_C_COMPILER ${MSVC_C_COMPILER} CACHE FILEPATH "C compiler" FORCE)
+            message(STATUS "Found MSVC C compiler: ${MSVC_C_COMPILER}")
+        endif()
+    endif()
+    
+    if(NOT CMAKE_CXX_COMPILER)
+        find_program(MSVC_CXX_COMPILER
+            NAMES cl.exe
+            PATHS
+                "C:/Program Files/Microsoft Visual Studio/2022/Enterprise/VC/Tools/MSVC/*/bin/Hostx64/x64"
+                "C:/Program Files/Microsoft Visual Studio/2022/Community/VC/Tools/MSVC/*/bin/Hostx64/x64"
+                "C:/Program Files/Microsoft Visual Studio/2022/Professional/VC/Tools/MSVC/*/bin/Hostx64/x64"
+                "C:/Program Files (x86)/Microsoft Visual Studio/*/VC/Tools/MSVC/*/bin/Hostx64/x64"
+            DOC "MSVC CXX Compiler"
+        )
+        if(MSVC_CXX_COMPILER)
+            set(CMAKE_CXX_COMPILER ${MSVC_CXX_COMPILER} CACHE FILEPATH "CXX compiler" FORCE)
+            message(STATUS "Found MSVC C++ compiler: ${MSVC_CXX_COMPILER}")
+        endif()
+    endif()
+    
+    # Intel Fortran compiler should be available in PATH after setvars.bat
+    # Let CMake find it automatically if not explicitly set
     if(NOT CMAKE_Fortran_COMPILER)
-        find_program(IFORT_EXECUTABLE 
-            NAMES ifort.exe ifx.exe ifort ifx
-            PATHS 
+        message(STATUS "CMAKE_Fortran_COMPILER not set, trying to find Intel Fortran compiler")
+        
+        # Try to find Intel Fortran compiler in common locations
+        find_program(INTEL_FORTRAN_COMPILER
+            NAMES ifort.exe ifort ifx.exe ifx
+            PATHS
                 "C:/Program Files (x86)/Intel/oneAPI/compiler/latest/windows/bin/intel64"
                 "C:/Program Files (x86)/Intel/oneAPI/compiler/latest/windows/bin"
                 "C:/Program Files/Intel/oneAPI/compiler/latest/windows/bin/intel64"
                 "C:/Program Files/Intel/oneAPI/compiler/latest/windows/bin"
-                "C:/Program Files (x86)/Intel/oneAPI/compiler/2023.2.0/windows/bin/intel64"
-                "C:/Program Files (x86)/Intel/oneAPI/compiler/2023.2.0/windows/bin"
-                "C:/Program Files (x86)/Intel/oneAPI/compiler/2021.10.0/windows/bin/intel64"
-                "C:/Program Files (x86)/Intel/oneAPI/compiler/2021.10.0/windows/bin"
             DOC "Intel Fortran Compiler"
         )
 
-        if(IFORT_EXECUTABLE)
-            message(STATUS "Found Intel Fortran compiler: ${IFORT_EXECUTABLE}")
-            set(CMAKE_Fortran_COMPILER ${IFORT_EXECUTABLE} CACHE FILEPATH "Fortran compiler" FORCE)
+        if(INTEL_FORTRAN_COMPILER)
+            message(STATUS "Found Intel Fortran compiler: ${INTEL_FORTRAN_COMPILER}")
+            set(CMAKE_Fortran_COMPILER ${INTEL_FORTRAN_COMPILER} CACHE FILEPATH "Fortran compiler" FORCE)
         else()
-            message(WARNING "Intel Fortran compiler not found. Fortran compilation may fail.")
-            message(STATUS "Please ensure Intel oneAPI HPC Toolkit is installed and setvars.bat has been called.")
+            message(WARNING "Intel Fortran compiler not found automatically")
+            message(STATUS "Please ensure Intel oneAPI HPC Toolkit is installed and CMAKE_Fortran_COMPILER is set")
         endif()
+    else()
+        message(STATUS "Using specified Fortran compiler: ${CMAKE_Fortran_COMPILER}")
     endif()
 endif()
 
@@ -79,7 +112,7 @@ endif()
 
 # Include cmake-js
 if(CMAKE_JS_INC)
-    include_directories(${CMAKE_JS_INC})
+include_directories(${CMAKE_JS_INC})
 endif()
 
 # Add Node.js include path for node_api.h
@@ -93,7 +126,18 @@ include_directories(${NODE_INCLUDE_DIR})
 # Platform-specific package finding
 if(WIN32 AND MSVC)
     # Windows with MSVC: Use vcpkg for FFTW3
-    find_package(FFTW3 CONFIG REQUIRED)
+    # Try to find FFTW3 package with lowercase name first
+    find_package(fftw3 CONFIG REQUIRED)
+    if(TARGET fftw3::fftw3)
+        message(STATUS "Found FFTW3 (as fftw3::fftw3)")
+        # Create alias for consistency if needed
+        if(NOT TARGET FFTW3::fftw3)
+            add_library(FFTW3::fftw3 ALIAS fftw3::fftw3)
+        endif()
+        set(FFTW3_FOUND TRUE)
+    else()
+        message(FATAL_ERROR "FFTW3 not found. Please install via vcpkg: vcpkg install fftw3[core]:x64-windows")
+    endif()
 
     # Set CMake policy for newer Boost versions
     if(POLICY CMP0167)
@@ -182,25 +226,34 @@ if(WIN32 AND MSVC)
         ${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}
-    )
+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
 if(WIN32 AND MSVC)
+    # Determine the correct FFTW3 target name for wsjtx_lib
+    if(TARGET FFTW3::fftw3)
+        set(FFTW3_LIB_TARGET FFTW3::fftw3)
+    elseif(TARGET fftw3::fftw3)
+        set(FFTW3_LIB_TARGET fftw3::fftw3)
+    else()
+        message(FATAL_ERROR "No valid FFTW3 target found for wsjtx_lib")
+    endif()
+    
     set(LIBRARIES_FROM_REFERENCES 
-        FFTW3::fftw3
+        ${FFTW3_LIB_TARGET}
     )
 else()
-    set(LIBRARIES_FROM_REFERENCES 
-        ${FFTW3F_LIBRARIES}
-        ${FFTW_THREADS_LIBRARIES}
-    )
+set(LIBRARIES_FROM_REFERENCES 
+    ${FFTW3F_LIBRARIES}
+    ${FFTW_THREADS_LIBRARIES}
+)
 endif()
 
 # Platform-specific library setup
@@ -292,8 +345,8 @@ add_subdirectory(wsjtx_lib)
 
 # Link directories (must be before creating target)
 if(NOT WIN32 OR NOT MSVC)
-    if(NOT WIN32)
-        link_directories(${FFTW3F_LIBRARY_DIRS})
+if(NOT WIN32)
+    link_directories(${FFTW3F_LIBRARY_DIRS})
     endif()
 endif()
 
@@ -325,7 +378,7 @@ set_target_properties(${PROJECT_NAME} PROPERTIES
 
 # Set Node.js addon include directories
 if(CMAKE_JS_INC)
-    target_include_directories(${PROJECT_NAME} PRIVATE ${CMAKE_JS_INC})
+target_include_directories(${PROJECT_NAME} PRIVATE ${CMAKE_JS_INC})
 endif()
 
 # Compiler-specific options
@@ -336,8 +389,8 @@ target_compile_definitions(${PROJECT_NAME} PRIVATE
 
 # Add compile flags
 if(NOT WIN32 OR NOT MSVC)
-    if(NOT WIN32)
-        target_compile_options(${PROJECT_NAME} PRIVATE ${FFTW3F_CFLAGS_OTHER})
+if(NOT WIN32)
+    target_compile_options(${PROJECT_NAME} PRIVATE ${FFTW3F_CFLAGS_OTHER})
     endif()
 endif()
 
@@ -353,9 +406,19 @@ elseif(WIN32 AND MSVC)
     if(CMAKE_JS_LIB)
         target_link_libraries(${PROJECT_NAME} PRIVATE ${CMAKE_JS_LIB})
     endif()
+    
+    # Determine the correct FFTW3 target name
+    if(TARGET FFTW3::fftw3)
+        set(FFTW3_TARGET FFTW3::fftw3)
+    elseif(TARGET fftw3::fftw3)
+        set(FFTW3_TARGET fftw3::fftw3)
+    else()
+        message(FATAL_ERROR "No valid FFTW3 target found")
+    endif()
+    
     target_link_libraries(${PROJECT_NAME} PRIVATE
         wsjtx_lib
-        FFTW3::fftw3
+        ${FFTW3_TARGET}
         ${BOOST_LIBRARIES}
     )
 else()