Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Use different var for nc/nf-config --includedir outputs #10

Merged
merged 3 commits into from
Dec 22, 2023
Merged

Use different var for nc/nf-config --includedir outputs #10

Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
b8c898f
Use different var for nc/nf-config --includedir outputs
bartgol Dec 22, 2023
f31a257
Fix INCLUDE spelling in a couple of vars
bartgol Dec 22, 2023
929ca39
Fix possible typo in FindNetCDF.cmake
bartgol Dec 22, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
12 changes: 6 additions & 6 deletions cmake/FindNetCDF.cmake
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand All @@ -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()
Expand All @@ -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}
Expand Down