From ee0926f267a72e3fff59bd4da01e9ce0c638589b Mon Sep 17 00:00:00 2001 From: Matthew Thompson Date: Tue, 13 Feb 2024 08:06:02 -0500 Subject: [PATCH 1/3] Update FindESMF.cmake to make ESMF::ESMF main target --- cmake/FindESMF.cmake | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/cmake/FindESMF.cmake b/cmake/FindESMF.cmake index eabba677d3..330f16ccba 100644 --- a/cmake/FindESMF.cmake +++ b/cmake/FindESMF.cmake @@ -96,22 +96,22 @@ if(EXISTS ${ESMFMKFILE}) message(WARNING "Static ESMF library (libesmf.a) not found in \ ${ESMF_LIBSDIR}. Try setting USE_ESMF_STATIC_LIBS=OFF") endif() - if(NOT TARGET ESMF) - add_library(ESMF STATIC IMPORTED) + if(NOT TARGET ESMF::ESMF) + add_library(ESMF::ESMF STATIC IMPORTED) endif() else() find_library(ESMF_LIBRARY_LOCATION NAMES esmf PATHS ${ESMF_LIBSDIR} NO_DEFAULT_PATH) if(ESMF_LIBRARY_LOCATION MATCHES "ESMF_LIBRARY_LOCATION-NOTFOUND") message(WARNING "ESMF library not found in ${ESMF_LIBSDIR}.") endif() - if(NOT TARGET ESMF) - add_library(ESMF UNKNOWN IMPORTED) + if(NOT TARGET ESMF::ESMF) + add_library(ESMF::ESMF UNKNOWN IMPORTED) endif() endif() # Add target alias to facilitate unambiguous linking - if(NOT TARGET ESMF::ESMF) - add_library(ESMF::ESMF ALIAS ESMF) + if(NOT TARGET ESMF) + add_library(ESMF ALIAS ESMF::ESMF) endif() # Add ESMF include directories @@ -135,7 +135,7 @@ if(EXISTS ${ESMFMKFILE}) ESMF_F90COMPILEPATHS VERSION_VAR ESMF_VERSION) - set_target_properties(ESMF PROPERTIES + set_target_properties(ESMF::ESMF PROPERTIES IMPORTED_LOCATION "${ESMF_LIBRARY_LOCATION}" INTERFACE_INCLUDE_DIRECTORIES "${ESMF_INCLUDE_DIRECTORIES}" INTERFACE_LINK_LIBRARIES "${ESMF_INTERFACE_LINK_LIBRARIES}") From c36ff2672684d6f45260144f8e56e11d5aacd140 Mon Sep 17 00:00:00 2001 From: Matthew Thompson Date: Tue, 13 Feb 2024 12:37:29 -0500 Subject: [PATCH 2/3] Clean up comment --- cmake/FindESMF.cmake | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/cmake/FindESMF.cmake b/cmake/FindESMF.cmake index 330f16ccba..4eb0f6a54e 100644 --- a/cmake/FindESMF.cmake +++ b/cmake/FindESMF.cmake @@ -109,7 +109,7 @@ if(EXISTS ${ESMFMKFILE}) endif() endif() - # Add target alias to facilitate unambiguous linking + # Add ESMF as an alias to ESMF::ESMF for backward compatibility if(NOT TARGET ESMF) add_library(ESMF ALIAS ESMF::ESMF) endif() From f65b8a701fab14f2438fe05a3ddfc928dc59d5ba Mon Sep 17 00:00:00 2001 From: Matthew Thompson Date: Wed, 13 Mar 2024 14:46:01 -0400 Subject: [PATCH 3/3] Update other FindESMF.cmake files --- .../ESMX/Comps/ESMX_Data/cmake/FindESMF.cmake | 16 ++++++++-------- src/addon/ESMX/Driver/cmake/FindESMF.cmake | 16 ++++++++-------- 2 files changed, 16 insertions(+), 16 deletions(-) diff --git a/src/addon/ESMX/Comps/ESMX_Data/cmake/FindESMF.cmake b/src/addon/ESMX/Comps/ESMX_Data/cmake/FindESMF.cmake index eabba677d3..4eb0f6a54e 100644 --- a/src/addon/ESMX/Comps/ESMX_Data/cmake/FindESMF.cmake +++ b/src/addon/ESMX/Comps/ESMX_Data/cmake/FindESMF.cmake @@ -96,22 +96,22 @@ if(EXISTS ${ESMFMKFILE}) message(WARNING "Static ESMF library (libesmf.a) not found in \ ${ESMF_LIBSDIR}. Try setting USE_ESMF_STATIC_LIBS=OFF") endif() - if(NOT TARGET ESMF) - add_library(ESMF STATIC IMPORTED) + if(NOT TARGET ESMF::ESMF) + add_library(ESMF::ESMF STATIC IMPORTED) endif() else() find_library(ESMF_LIBRARY_LOCATION NAMES esmf PATHS ${ESMF_LIBSDIR} NO_DEFAULT_PATH) if(ESMF_LIBRARY_LOCATION MATCHES "ESMF_LIBRARY_LOCATION-NOTFOUND") message(WARNING "ESMF library not found in ${ESMF_LIBSDIR}.") endif() - if(NOT TARGET ESMF) - add_library(ESMF UNKNOWN IMPORTED) + if(NOT TARGET ESMF::ESMF) + add_library(ESMF::ESMF UNKNOWN IMPORTED) endif() endif() - # Add target alias to facilitate unambiguous linking - if(NOT TARGET ESMF::ESMF) - add_library(ESMF::ESMF ALIAS ESMF) + # Add ESMF as an alias to ESMF::ESMF for backward compatibility + if(NOT TARGET ESMF) + add_library(ESMF ALIAS ESMF::ESMF) endif() # Add ESMF include directories @@ -135,7 +135,7 @@ if(EXISTS ${ESMFMKFILE}) ESMF_F90COMPILEPATHS VERSION_VAR ESMF_VERSION) - set_target_properties(ESMF PROPERTIES + set_target_properties(ESMF::ESMF PROPERTIES IMPORTED_LOCATION "${ESMF_LIBRARY_LOCATION}" INTERFACE_INCLUDE_DIRECTORIES "${ESMF_INCLUDE_DIRECTORIES}" INTERFACE_LINK_LIBRARIES "${ESMF_INTERFACE_LINK_LIBRARIES}") diff --git a/src/addon/ESMX/Driver/cmake/FindESMF.cmake b/src/addon/ESMX/Driver/cmake/FindESMF.cmake index eabba677d3..4eb0f6a54e 100644 --- a/src/addon/ESMX/Driver/cmake/FindESMF.cmake +++ b/src/addon/ESMX/Driver/cmake/FindESMF.cmake @@ -96,22 +96,22 @@ if(EXISTS ${ESMFMKFILE}) message(WARNING "Static ESMF library (libesmf.a) not found in \ ${ESMF_LIBSDIR}. Try setting USE_ESMF_STATIC_LIBS=OFF") endif() - if(NOT TARGET ESMF) - add_library(ESMF STATIC IMPORTED) + if(NOT TARGET ESMF::ESMF) + add_library(ESMF::ESMF STATIC IMPORTED) endif() else() find_library(ESMF_LIBRARY_LOCATION NAMES esmf PATHS ${ESMF_LIBSDIR} NO_DEFAULT_PATH) if(ESMF_LIBRARY_LOCATION MATCHES "ESMF_LIBRARY_LOCATION-NOTFOUND") message(WARNING "ESMF library not found in ${ESMF_LIBSDIR}.") endif() - if(NOT TARGET ESMF) - add_library(ESMF UNKNOWN IMPORTED) + if(NOT TARGET ESMF::ESMF) + add_library(ESMF::ESMF UNKNOWN IMPORTED) endif() endif() - # Add target alias to facilitate unambiguous linking - if(NOT TARGET ESMF::ESMF) - add_library(ESMF::ESMF ALIAS ESMF) + # Add ESMF as an alias to ESMF::ESMF for backward compatibility + if(NOT TARGET ESMF) + add_library(ESMF ALIAS ESMF::ESMF) endif() # Add ESMF include directories @@ -135,7 +135,7 @@ if(EXISTS ${ESMFMKFILE}) ESMF_F90COMPILEPATHS VERSION_VAR ESMF_VERSION) - set_target_properties(ESMF PROPERTIES + set_target_properties(ESMF::ESMF PROPERTIES IMPORTED_LOCATION "${ESMF_LIBRARY_LOCATION}" INTERFACE_INCLUDE_DIRECTORIES "${ESMF_INCLUDE_DIRECTORIES}" INTERFACE_LINK_LIBRARIES "${ESMF_INTERFACE_LINK_LIBRARIES}")