@@ -337,6 +337,7 @@ endif
337
337
-@echo "ESMF_INSTALL_LIBDIR: $(ESMF_INSTALL_LIBDIR)"
338
338
-@echo "ESMF_INSTALL_BINDIR: $(ESMF_INSTALL_BINDIR)"
339
339
-@echo "ESMF_INSTALL_DOCDIR: $(ESMF_INSTALL_DOCDIR)"
340
+ -@echo "ESMF_INSTALL_CMAKEDIR: $(ESMF_INSTALL_CMAKEDIR)"
340
341
-@echo " "
341
342
-@echo "--------------------------------------------------------------"
342
343
-@echo " * ESMF Benchmark directory and parameters *"
@@ -479,6 +480,7 @@ endif
479
480
-@echo "ESMF_APPSDIR=$(ESMF_APPSDIR)" >> $(MKINFO)
480
481
-@echo "ESMF_LIBSDIR=$(ESMF_LIBDIR)" >> $(MKINFO)
481
482
-@echo "ESMF_ESMXDIR=$(ESMF_ESMXDIR)" >> $(MKINFO)
483
+ -@echo "ESMF_CMAKEDIR=$(ESMF_CMAKEDIR)" >> $(MKINFO)
482
484
-@echo "" >> $(MKINFO)
483
485
-@echo "" >> $(MKINFO)
484
486
-@echo "ESMF_F90COMPILER=$(ESMF_F90COMPILER)" >> $(MKINFO)
@@ -772,7 +774,7 @@ envdump:
772
774
773
775
# Rewrite esmf.mk during installation to ensure correct installation paths are encoded
774
776
install_info_mk :
775
- $(MAKE ) info_mk ESMF_APPSDIR=$(ESMF_INSTALL_BINDIR_ABSPATH ) ESMF_LDIR=$(ESMF_INSTALL_LIBDIR_ABSPATH ) ESMF_LIBDIR=$(ESMF_INSTALL_LIBDIR_ABSPATH ) ESMF_ESMXDIR=$(ESMF_INSTALL_HEADERDIR_ABSPATH ) /ESMX ESMF_MODDIR=$(ESMF_INSTALL_MODDIR_ABSPATH ) ESMF_INCDIR=$(ESMF_INSTALL_HEADERDIR_ABSPATH )
777
+ $(MAKE ) info_mk ESMF_APPSDIR=$(ESMF_INSTALL_BINDIR_ABSPATH ) ESMF_LDIR=$(ESMF_INSTALL_LIBDIR_ABSPATH ) ESMF_LIBDIR=$(ESMF_INSTALL_LIBDIR_ABSPATH ) ESMF_ESMXDIR=$(ESMF_INSTALL_HEADERDIR_ABSPATH ) /ESMX ESMF_CMAKEDIR= $( ESMF_INSTALL_CMAKEDIR_ABSPATH ) ESMF_MODDIR=$(ESMF_INSTALL_MODDIR_ABSPATH ) ESMF_INCDIR=$(ESMF_INSTALL_HEADERDIR_ABSPATH )
776
778
777
779
# Relink apps during installation to ensure correct shared library location is encoded
778
780
install_apps :
@@ -811,6 +813,8 @@ install: envdump
811
813
cp -f $(ESMF_BUILD ) /src/include/ESMC_* .h $(ESMF_INSTALL_HEADERDIR_ABSPATH )
812
814
cp -f $(ESMF_DIR ) /build_config/$(ESMF_OS ) .$(ESMF_COMPILER ) .$(ESMF_SITE ) /ESMC_Conf.h $(ESMF_INSTALL_HEADERDIR_ABSPATH )
813
815
cp -fr $(ESMF_ESMXDIR ) $(ESMF_INSTALL_HEADERDIR_ABSPATH )
816
+ mkdir -p $(ESMF_INSTALL_CMAKEDIR_ABSPATH )
817
+ cp -f $(ESMF_CMAKEDIR ) /* .cmake $(ESMF_INSTALL_CMAKEDIR_ABSPATH )
814
818
mkdir -p $(ESMF_INSTALL_MODDIR_ABSPATH )
815
819
cp -f $(ESMF_MODDIR ) /* .mod $(ESMF_INSTALL_MODDIR_ABSPATH )
816
820
mkdir -p $(ESMF_INSTALL_LIBDIR_ABSPATH )
0 commit comments