Merge branch 'main' into jgfouca/disable_ctest

ESMCI · Feb 2, 2024 · bbbc037 · bbbc037
2 parents 47fbaef + 845bb11
commit bbbc037
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 6 deletions.
diff --git a/cmake/FindNetCDF.cmake b/cmake/FindNetCDF.cmake
@@ -18,7 +18,7 @@ if(NetCDF_Fortran_CONFIG_EXECUTABLE)
     # Note that if the process fails (as e.g. on Windows), the output variables
     # will remain empty
   execute_process(COMMAND ${NetCDF_Fortran_CONFIG_EXECUTABLE} --includedir
-                    OUTPUT_VARIABLE DEFAULT_INCLUDE_DIR
+                    OUTPUT_VARIABLE DEFAULT_Fortran_INCLUDE_DIR
                     OUTPUT_STRIP_TRAILING_WHITESPACE)
   execute_process(COMMAND ${NetCDF_Fortran_CONFIG_EXECUTABLE} --flibs
                     OUTPUT_VARIABLE flibs
@@ -43,12 +43,12 @@ if(NetCDF_C_CONFIG_EXECUTABLE)
     # Note that if the process fails (as e.g. on Windows), the output variables
     # will remain empty
   execute_process(COMMAND ${NetCDF_C_CONFIG_EXECUTABLE} --includedir
-                    OUTPUT_VARIABLE DEFAULT_INCLUDE_DIR
+                    OUTPUT_VARIABLE DEFAULT_C_INCLUDE_DIR
                     OUTPUT_STRIP_TRAILING_WHITESPACE)
   execute_process(COMMAND ${NetCDF_C_CONFIG_EXECUTABLE} --libs
-                    OUTPUT_VARIABLE libs
+                    OUTPUT_VARIABLE clibs
                     OUTPUT_STRIP_TRAILING_WHITESPACE)
-  if (flibs)
+  if (clibs)
     set(NetCDF_C_LIBRARIES ${libs} CACHE STRING "NetCDF libraries (or linking flags)")
     set(AUTODETECTED_NetCDF_C ON)
   endif()
@@ -65,15 +65,15 @@ else()
 endif()
 
 find_path(NetCDF_Fortran_INCLUDE_DIRS netcdf.mod
-  HINTS "${DEFAULT_INCLUDE_DIR}" "$ENV{NetCDF_Fortran_INCLDE_DIRS}" "$ENV{CONDA_PREFIX}/Library/include"
+  HINTS "${DEFAULT_Fortran_INCLUDE_DIR}" "$ENV{NetCDF_Fortran_INCLUDE_DIRS}" "$ENV{CONDA_PREFIX}/Library/include"
   DOC "NetCDF Fortran include directories")
 
 find_library(NetCDF_Fortran_LIBRARY NAMES ${DEFAULT_LIBRARY_NAME}
             HINTS "${DEFAULT_LIBRARY_DIR}" "$ENV{NetCDF_Fortran_LIBRARY}" "$ENV{CONDA_PREFIX}/Library/lib"
             DOC "NetCDF libraries (or linking flags)")
 
 find_path(NetCDF_C_INCLUDE_DIRS netcdf.h
-  HINTS "${DEFAULT_INCLUDE_DIR}" "$ENV{NetCDF_C_INCLDE_DIRS}" "$ENV{CONDA_PREFIX}/Library/include"
+  HINTS "${DEFAULT_C_INCLUDE_DIR}" "$ENV{NetCDF_C_INCLUDE_DIRS}" "$ENV{CONDA_PREFIX}/Library/include"
   DOC "NetCDF C include directories")
 
 find_library(NetCDF_C_LIBRARY NAMES ${DEFAULT_LIBRARY_NAME}

diff --git a/version.inc b/version.inc
@@ -1 +1,2 @@
 character(len=*), parameter :: version="v1.0.5"
+
Original file line number	Diff line number	Diff line change
		@@ -1 +1,2 @@
		character(len=*), parameter :: version="v1.0.5"