install cmake files in <install>/lib/cmake/cdi

ChangeLog

@@ -2,6 +2,10 @@
 
 	* Version 2.1.0 released
 
+2022-09-30  Uwe Schulzweida
+
+	* install cmake files in <install>/lib/cmake/cdi
+
 2022-08-12  Uwe Schulzweida
 
 	* added CDI_KEY_CHUNKTYPE and CDI_KEY_CHUNKSIZE

config/default

@@ -42,7 +42,7 @@ case "${HOSTNAME}" in
 	            CC=icc CFLAGS="-g -D_REENTRANT -Wall -Wwrite-strings -O3 -march=native -fp-model source"
 	;;
     bailung*|d133*|d134*)
-	${CONFPATH}configure --prefix=$HOME/local \
+	${CONFPATH}configure --prefix=$HOME/local/cdi \
                     --enable-maintainer-mode \
                     --enable-iso-c-interface \
                     --enable-swig \
@@ -69,7 +69,7 @@ case "${HOSTNAME}" in
                  --with-fdb5=$HOME/src/fdb \
                  --with-eccodes=$HOME/local/eccodes-2.22.0 \
                  --with-netcdf=$HOME/local/netcdf-c-4.9.0"
-        PREFIX="--prefix=$HOME/local"
+        PREFIX="--prefix=$HOME/local/cdi"
         LD_ADD="-Wl,-rpath,$HOME/local/eccodes-2.22.0/lib -Wl,-rpath,$HOME/src/fdb/lib"
         if  test "$COMP" = clang ; then
           ${CONFPATH}configure $CONFIG_OPTS $PREFIX $CDILIBS LDFLAGS="$LD_ADD $LDFLAGS" \

configure.ac

@@ -440,7 +440,7 @@ AC_CONFIG_FILES([tests/test_cksum_grib \
 
 AC_CONFIG_FILES([Makefile src/Makefile interfaces/Makefile app/Makefile \
 	tests/Makefile examples/Makefile cdi.settings \
-	examples/pio/Makefile src/cmake/libcdi/cdi-config.cmake src/cmake/libcdi/cdi-config-version.cmake \
+	examples/pio/Makefile src/cmake/cdi/cdi-config.cmake src/cmake/cdi/cdi-config-version.cmake \
         src/pkgconfig/cdi.pc src/pkgconfig/cdipio.pc src/pkgconfig/cdi_f2003.pc])
 AC_OUTPUT
 

src/Makefile.am

@@ -270,8 +270,8 @@ libcdipio_la_LIBADD   = libcdi.la $(LIBRT) $(PPM_CORE_LIBS) $(YAXT_LIBS) $(MPI_C
 
 LOCALTARGETS  =
 if ENABLE_CDI_LIB
-LOCALTARGETS += cmake/libcdi/cdi-config.cmake
-LOCALTARGETS += cmake/libcdi/cdi-config-version.cmake
+LOCALTARGETS += cmake/cdi/cdi-config.cmake
+LOCALTARGETS += cmake/cdi/cdi-config-version.cmake
 LOCALTARGETS += pkgconfig/cdi.pc
 if USE_MPI
 LOCALTARGETS += pkgconfig/cdipio.pc
@@ -295,11 +295,11 @@ mo_cdi.$(FCMODEXT): mo_cdi.lo
 endif
 	@if test ! -f $@; then rm -f $<; $(MAKE) $<; fi
 #
-cmake/libcdi/cdi-config.cmake: cmake/libcdi/cdi-config.cmake.in ../config.status
-	(cd .. ; ./config.status src/cmake/libcdi/cdi-config.cmake)
+cmake/cdi/cdi-config.cmake: cmake/cdi/cdi-config.cmake.in ../config.status
+	(cd .. ; ./config.status src/cmake/cdi/cdi-config.cmake)
 
-cmake/libcdi/cdi-config-version.cmake: cmake/libcdi/cdi-config-version.cmake.in ../config.status
-	(cd .. ; ./config.status src/cmake/libcdi/cdi-config-version.cmake)
+cmake/cdi/cdi-config-version.cmake: cmake/cdi/cdi-config-version.cmake.in ../config.status
+	(cd .. ; ./config.status src/cmake/cdi/cdi-config-version.cmake)
 
 pkgconfig/cdi.pc: pkgconfig/cdi.pc.in ../config.status
 	(cd .. ; ./config.status src/pkgconfig/cdi.pc)
@@ -326,10 +326,10 @@ endif
 endif
 
 if ENABLE_CDI_LIB
-CMAKECONFIG_FILES = cmake/libcdi/cdi-config.cmake
-CLEANFILES += cmake/libcdi/cdi-config.cmake
-CMAKECONFIG_FILES += cmake/libcdi/cdi-config-version.cmake
-CLEANFILES += cmake/libcdi/cdi-config-version.cmake
+CMAKECONFIG_FILES = cmake/cdi/cdi-config.cmake
+CLEANFILES += cmake/cdi/cdi-config.cmake
+CMAKECONFIG_FILES += cmake/cdi/cdi-config-version.cmake
+CLEANFILES += cmake/cdi/cdi-config-version.cmake
 PKGCONFIG_FILES = pkgconfig/cdi.pc
 CLEANFILES += pkgconfig/cdi.pc
 if USE_MPI