Skip to content
Closed
Show file tree
Hide file tree
Changes from all commits
Commits
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
1 change: 1 addition & 0 deletions .github/workflows/datm_noahmp.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -113,6 +113,7 @@ jobs:
component_build: |
export PATH=${{ env.DEP_INSTALL_DIR }}/view/bin:$PATH
export ESMFMKFILE=${{ env.DEP_INSTALL_DIR }}/view/lib/esmf.mk
export ESMF_ROOT=${{ env.DEP_INSTALL_DIR }}/view
export NetCDF_ROOT=${{ env.DEP_INSTALL_DIR }}/view
export FC=gfortran
cd ${{ env.APP_INSTALL_DIR }}/noahmp
Expand Down
9 changes: 5 additions & 4 deletions CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -36,10 +36,11 @@ list(APPEND _noahmp_files src/module_sf_noahmplsm.F90
# Find dependencies
find_package(MPI REQUIRED)
find_package(NetCDF REQUIRED)
if (TARGET esmf)
message("Target esmf is already found. Skip find_package ...")
if (TARGET ESMF::ESMF)
message("Target ESMF::ESMF is already found. Skip find_package ...")
else()
set(USE_ESMF_STATIC_LIBS TRUE)
list(APPEND CMAKE_MODULE_PATH $ENV{ESMF_ROOT}/cmake)
find_package(ESMF REQUIRED)
if (ESMF_FOUND)
set(CMAKE_Fortran_COMPILER "${ESMF_F90COMPILER}")
Expand Down Expand Up @@ -74,7 +75,7 @@ set_target_properties(noahmp PROPERTIES
)
target_include_directories(noahmp PUBLIC $<BUILD_INTERFACE:${CMAKE_CURRENT_BINARY_DIR}/include>
$<INSTALL_INTERFACE:include>)
target_link_libraries(noahmp PUBLIC esmf fms)
target_link_libraries(noahmp PUBLIC ESMF::ESMF fms)

#------------------------------------------------------------------------------
# CMake export for ESMX driver
Expand All @@ -101,4 +102,4 @@ install(
install(DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}/include DESTINATION ${CMAKE_INSTALL_PREFIX})

install(EXPORT noahmp
DESTINATION lib/cmake)
DESTINATION lib/cmake)
138 changes: 0 additions & 138 deletions cmake/FindESMF.cmake

This file was deleted.