Added more path options

earth-system-radiation · Dec 19, 2024 · 0905886 · 0905886
1 parent b2ee957
commit 0905886
Showing 1 changed file with 19 additions and 14 deletions.
diff --git a/CMakeLists.txt b/CMakeLists.txt
@@ -62,32 +62,37 @@ if(NOT WINDOWS)
 else()
     message(STATUS "Conda Environment: $ENV{CONDA_PREFIX}")
 
-    find_program(CMAKE_AR "ar"
+    find_program(CMAKE_AR ar
         PATHS
-        $ENV{CONDA_PREFIX}/Library/x86_64-w64-mingw32/bin
+        $ENV{PREFIX}/Library/mingw-w64/bin
+        $ENV{PREFIX}/Library/x86_64-w64-mingw32/bin
         $ENV{BUILD_PREFIX}/Library/mingw-w64/bin
         $ENV{BUILD_PREFIX}/Library/x86_64-w64-mingw32/bin
+        $ENV{CONDA_PREFIX}/Library/x86_64-w64-mingw32/bin
         NO_DEFAULT_PATH
     )
 
-    find_program(CMAKE_RANLIB "ranlib"
+    find_program(CMAKE_RANLIB ranlib
         PATHS
-        $ENV{CONDA_PREFIX}/Library/x86_64-w64-mingw32/bin
+        $ENV{PREFIX}/Library/mingw-w64/bin
+        $ENV{PREFIX}/Library/x86_64-w64-mingw32/bin
         $ENV{BUILD_PREFIX}/Library/mingw-w64/bin
         $ENV{BUILD_PREFIX}/Library/x86_64-w64-mingw32/bin
+        $ENV{CONDA_PREFIX}/Library/x86_64-w64-mingw32/bin
         NO_DEFAULT_PATH
     )
 
-    find_program(CMAKE_Fortran_COMPILER "gfortran"
-        PATHS
-        $ENV{CONDA_PREFIX}/Library/bin
-        $ENV{BUILD_PREFIX}/Library/bin
-        NO_DEFAULT_PATH
-    )
-
-    file(TO_CMAKE_PATH ${CMAKE_AR} CMAKE_AR)
-    file(TO_CMAKE_PATH ${CMAKE_RANLIB} CMAKE_RANLIB)
-    file(TO_CMAKE_PATH ${CMAKE_Fortran_COMPILER} CMAKE_Fortran_COMPILER)
+    # find_program(CMAKE_Fortran_COMPILER gfortran
+    #     PATHS
+    #     $ENV{PREFIX}/Library/bin
+    #     $ENV{BUILD_PREFIX}/Library/bin
+    #     $ENV{CONDA_PREFIX}/Library/bin
+    #     NO_DEFAULT_PATH
+    # )
+
+    message(STATUS "CMAKE_AR: ${CMAKE_AR}")
+    message(STATUS "CMAKE_RANLIB: ${CMAKE_RANLIB}")
+    message(STATUS "CMAKE_Fortran_COMPILER: ${CMAKE_Fortran_COMPILER}")
 endif()
 
 # Check if the Fortran compiler is available