diff --git a/CMakeLists.txt b/CMakeLists.txt index da029328d..8b17c19a1 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -43,7 +43,7 @@ ENDIF () # Have the .mod files placed in the include folder SET(CMAKE_Fortran_MODULE_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}/mod) -# Add our local modules to the module path +# Add our local modules to the module ldpath FILE(TO_CMAKE_PATH "${CMAKE_SOURCE_DIR}/cmake/Modules" LOCAL_MODULE_PATH) LIST(APPEND CMAKE_MODULE_PATH ${LOCAL_MODULE_PATH}) diff --git a/cmake/Modules/FindNETCDF.cmake b/cmake/Modules/FindNETCDF.cmake index cee2fabad..91a7cf706 100644 --- a/cmake/Modules/FindNETCDF.cmake +++ b/cmake/Modules/FindNETCDF.cmake @@ -66,7 +66,11 @@ FIND_PATH(NETCDF_INCLUDE_DIR ) IF (BUILD_SHARED_LIBS) - SET(NETCDFF "netcdff") + IF (CMAKE_SYSTEM_NAME STREQUAL "Windows") + SET(NETCDFF "netcdff.dll") + ELSE () + SET(NETCDFF "netcdff") + ENDIF () ELSE () SET(NCPREFIX_DIR ${CMAKE_SOURCE_DIR} CACHE PATH "Location of provided NetCDF-C dependencies") SET(H5PREFIX_DIR ${CMAKE_SOURCE_DIR} CACHE PATH "Location of provided HDF5 dependencies") @@ -95,6 +99,7 @@ FIND_LIBRARY(NETCDF_FORTRAN_LIBRARY ENV LD_LIBRARY_PATH PATH_SUFFIXES lib + bin ${CMAKE_LIBRARY_ARCHITECTURE} REQUIRED )