From 42edf8c263e9efb88a0c9faf0be5b7d58a872f17 Mon Sep 17 00:00:00 2001 From: MintoDA1 <51412913+MintoDA1@users.noreply.github.com> Date: Tue, 19 Sep 2023 20:15:58 -0400 Subject: [PATCH] Pulled in changes from other branch --- cmake/Modules/FindNETCDF.cmake | 9 ++------- 1 file changed, 2 insertions(+), 7 deletions(-) diff --git a/cmake/Modules/FindNETCDF.cmake b/cmake/Modules/FindNETCDF.cmake index 05f91e77c..cee2fabad 100644 --- a/cmake/Modules/FindNETCDF.cmake +++ b/cmake/Modules/FindNETCDF.cmake @@ -51,7 +51,6 @@ IF(NOT CMAKE_SYSTEM_NAME STREQUAL "Windows") ENDIF() ENDIF() -MESSAGE(STATUS "\nNETCDF_INCLUDE: $ENV{NETCDF_INCLUDE}\nNETCDF_FORTRAN_HOME: $ENV{NETCDF_FORTRAN_HOME}\n") FIND_PATH(NETCDF_INCLUDE_DIR NAMES netcdf.mod HINTS @@ -66,8 +65,6 @@ FIND_PATH(NETCDF_INCLUDE_DIR REQUIRED ) -MESSAGE(STATUS "NetCDF-Fortran include directory: ${NETCDF_INCLUDE_DIR}") - IF (BUILD_SHARED_LIBS) SET(NETCDFF "netcdff") ELSE () @@ -102,8 +99,6 @@ FIND_LIBRARY(NETCDF_FORTRAN_LIBRARY REQUIRED ) -MESSAGE(STATUS "NetCDF-Fortran Library: ${NETCDF_FORTRAN_LIBRARY}") - IF (BUILD_SHARED_LIBS) SET(NETCDF_LIBRARIES ${NETCDF_FORTRAN_LIBRARY} CACHE STRING "NetCDF Fortran library") ELSE () @@ -119,7 +114,6 @@ ELSE () REQUIRED ) - MESSAGE(STATUS "NetCDF-C Library: ${NETCDF_LIBRARY}") IF (CMAKE_SYSTEM_NAME STREQUAL "Windows") FIND_LIBRARY(HDF5_LIBRARY NAMES ${HDF5} @@ -201,7 +195,8 @@ ELSE () # Note for posterity: When building static libraries, NETCDF_FORTRAN_LIBRARY must come *before* NETCDF_LIBRARY. Otherwise you get a bunch of "undefined reference to" errors SET(NETCDF_LIBRARIES ${NETCDF_FORTRAN_LIBRARY} ${NETCDF_LIBRARY} ${EXTRA_FLAGS} CACHE STRING "NetCDF Fortran and dependant static libraries") ENDIF () -MESSAGE(STATUS "NetCDF dependencies: ${NETCDF_LIBRARIES}") +MESSAGE(STATUS "NetCDF libraries: ${NETCDF_LIBRARIES}") +MESSAGE(STATUS "NetCDF include directory: ${NETCDF_INCLUDE_DIR}") SET(NETCDF_FOUND TRUE) MARK_AS_ADVANCED(NETCDF_LIBRARIES NETCDF_INCLUDE_DIR) \ No newline at end of file