Merge pull request #1875 from UV-CDAT/PCMDI_ONLY_TOOLS

Pcmdi only tools

CMake/cdat_modules/cd77_deps.cmake

@@ -0,0 +1 @@
+set(cd77_deps ${python_pkg} ${ezget_pkg} ${libcdms_pkg} ${setuptools_pkg} )

CMake/cdat_modules/cd77_external.cmake

@@ -0,0 +1,16 @@
+# create an external project to install cd77
+# and configure and build it
+
+ExternalProject_Add(cd77
+  DOWNLOAD_DIR ${CDAT_PACKAGE_CACHE_DIR}
+  SOURCE_DIR ${CMAKE_CURRENT_BINARY_DIR}/build/cd77
+  ${GIT_CMD_STR_cd77}
+  ${GIT_TAG_cd77}
+  BUILD_IN_SOURCE 1
+  CONFIGURE_COMMAND ""
+  BUILD_COMMAND ""
+  INSTALL_COMMAND env LD_LIBRARY_PATH=$ENV{LD_LIBRARY_PATH} CFLAGS=$ENV{CFLAGS} LDFLAGS=$ENV{LDFLAGS} PKG_CONFIG_PATH=$ENV{PKG_CONFIG_PATH} PYTHONPATH=${PYTHONPATH} ${USR_ENVS} ${PYTHON_EXECUTABLE} setup.py install ${USER_INSTALL_OPTIONS} ${PRFX}
+  DEPENDS ${${nm}_deps}
+  ${ep_log_options}
+)
+

CMake/cdat_modules/cd77_pkg.cmake

@@ -0,0 +1,13 @@
+set(cd77_VERSION 1.0.0)
+set(cd77_BRANCH master)
+set(cd77_REPOSITORY ${GIT_PROTOCOL}github.com/UV-CDAT/cd77.git )
+
+
+set(GIT_CMD_STR_cd77 GIT_REPOSITORY ${cd77_REPOSITORY})
+set(GIT_TAG_cd77 GIT_TAG "${cd77_BRANCH}")
+set (nm cd77)
+string(TOUPPER ${nm} uc_nm)
+
+if (CDAT_BUILD_PCMDI)
+  add_cdat_package(cd77 "" "" ON)
+endif()

CMake/cdat_modules/cdat_external.cmake

@@ -3,8 +3,8 @@ set(CDAT_source "${cdat_SOURCE_DIR}")
 set(RUNTIME_FLAGS ${cdat_EXTERNALS}/lib)
 set(LDFLAGS -L${cdat_EXTERNALS}/lib)
 
-if (CDAT_BUILD_WITH_LIBDRS)
- set(cdat_xtra_flags "${cdat_xtra_flags} -c pcmdi.py")
+if (CDAT_BUILD_LIBDRS)
+ set(cdat_xtra_flags "${cdat_xtra_flags} --enable-drs")
 endif()
 
 set(cdat_build_dir ${CMAKE_CURRENT_BINARY_DIR}/cdat-build)

CMake/cdat_modules/ezget_deps.cmake

@@ -0,0 +1 @@
+set(ezget_deps ${netcdf_pkg} ${libdrs_pkg} ${libcdms_pkg})

CMake/cdat_modules/ezget_external.cmake

@@ -0,0 +1,43 @@
+set(ezget_source "${CMAKE_CURRENT_BINARY_DIR}/build/ezget")
+set(ezget_install "${cdat_EXTERNALS}")
+
+configure_file(
+    ${cdat_CMAKE_SOURCE_DIR}/cdat_modules_extra/ezget_Makefile.gfortran.in
+    ${CMAKE_CURRENT_BINARY_DIR}/CMake/ezget_Makefile
+    )
+
+if(DEFINED GIT_CMD_STR_EZGET )
+    message("[INFO] [ezget] Installing ${nm} from ${GIT_CMD_STR_EZGET}")
+    include(GetGitRevisionDescription)
+    set(URL_STR )
+    set(URL_MD5_STR )
+else()
+    message("[INFO] [ezget] Installed ${nm} from tarball ${EZGET_GZ}")
+    set(URL_STR URL ${EZGET_URL}/${EZGET_GZ})
+    set(URL_MD5_STR URL_MD5 ${EZGET_MD5})
+    set(GIT_CMD_STR_EZGET )
+    set(GIT_TAG )
+endif()
+set(EZGET_MAKE_ARGS -f^^${CMAKE_CURRENT_BINARY_DIR}/CMake/ezget_Makefile)
+set(EZGET_MAKE_INSTALL_ARGS -f^^${CMAKE_CURRENT_BINARY_DIR}/CMake/ezget_Makefile^^install)
+set(EZGET_BUILD_ARGS -fPIC)
+
+ExternalProject_Add(ezget
+  LIST_SEPARATOR ^^
+  DOWNLOAD_DIR ${CDAT_PACKAGE_CACHE_DIR}
+  SOURCE_DIR ${ezget_source}
+  INSTALL_DIR ${ezget_install}
+  ${URL_STR}
+  ${URL_MD5_STR}
+  ${GIT_CMD_STR_EZGET}
+  ${GIT_TAG}
+  BUILD_IN_SOURCE 1
+  CONFIGURE_COMMAND ""
+  BUILD_COMMAND ${CMAKE_COMMAND} -DADDITIONAL_CFLAGS=${EZGET_BUILD_ARGS} -Dmake=$(MAKE) -DBUILD_ARGS=${EZGET_MAKE_ARGS} -DWORKING_DIR=<SOURCE_DIR> -P ${cdat_CMAKE_BINARY_DIR}/cdat_make_step.cmake
+  INSTALL_COMMAND ${CMAKE_COMMAND} -DADDITIONAL_CFLAGS=${EZGET_BUILD_ARGS} -Dmake=$(MAKE) -DBUILD_ARGS=${EZGET_MAKE_INSTALL_ARGS} -DWORKING_DIR=<SOURCE_DIR> -P ${cdat_CMAKE_BINARY_DIR}/cdat_make_step.cmake
+  DEPENDS ${ezget_deps}
+  ${ep_log_options}
+)
+if (DEFINED GIT_CMD_STR_EZGET)
+  unset(GIT_CMD_STR_EZGET)
+endif()

CMake/cdat_modules/ezget_pkg.cmake

@@ -0,0 +1,10 @@
+set(EZGET_VERSION 1.0.0)
+set(EZGET_BRANCH master)
+set(EZGET_REPOSITORY ${GIT_PROTOCOL}github.com/UV-CDAT/EzGet.git )
+
+set(GIT_CMD_STR_EZGET GIT_REPOSITORY ${EZGET_REPOSITORY})
+set(GIT_TAG GIT_TAG "${EZGET_BRANCH}")
+
+if (CDAT_BUILD_PCMDI)
+  add_cdat_package(ezget "" "" ON)
+endif()

CMake/cdat_modules/lats_deps.cmake

@@ -0,0 +1 @@
+set(lats_deps ${netcdf_pkg})

CMake/cdat_modules/lats_external.cmake

@@ -0,0 +1,44 @@
+
+set(lats_source "${CMAKE_CURRENT_BINARY_DIR}/build/lats")
+set(lats_install "${cdat_EXTERNALS}")
+
+configure_file(
+    ${cdat_CMAKE_SOURCE_DIR}/cdat_modules_extra/lats_Makefile.gfortran.in
+    ${CMAKE_CURRENT_BINARY_DIR}/CMake/lats_Makefile
+    )
+
+if(DEFINED GIT_CMD_STR_LATS )
+    message("[INFO] [lats] Installing ${nm} from ${GIT_CMD_STR_LATS}")
+    include(GetGitRevisionDescription)
+    set(URL_STR )
+    set(URL_MD5_STR )
+else()
+    message("[INFO] [lats] Installed ${nm} from tarball ${LATS_GZ}")
+    set(URL_STR URL ${LATS_URL}/${LATS_GZ})
+    set(URL_MD5_STR URL_MD5 ${LATS_MD5})
+    set(GIT_CMD_STR_LATS )
+    set(GIT_TAG )
+endif()
+set(LATS_MAKE_ARGS -f^^${CMAKE_CURRENT_BINARY_DIR}/CMake/lats_Makefile)
+set(LATS_MAKE_INSTALL_ARGS -f^^${CMAKE_CURRENT_BINARY_DIR}/CMake/lats_Makefile^^install)
+set(LATS_BUILD_ARGS -fPIC)
+
+ExternalProject_Add(lats
+  LIST_SEPARATOR ^^
+  DOWNLOAD_DIR ${CDAT_PACKAGE_CACHE_DIR}
+  SOURCE_DIR ${lats_source}
+  INSTALL_DIR ${lats_install}
+  ${URL_STR}
+  ${URL_MD5_STR}
+  ${GIT_CMD_STR_LATS}
+  ${GIT_TAG}
+  BUILD_IN_SOURCE 1
+  CONFIGURE_COMMAND ""
+  BUILD_COMMAND ${CMAKE_COMMAND} -DADDITIONAL_CFLAGS=${LATS_BUILD_ARGS} -Dmake=$(MAKE) -DBUILD_ARGS=${LATS_MAKE_ARGS} -DWORKING_DIR=<SOURCE_DIR> -P ${cdat_CMAKE_BINARY_DIR}/cdat_make_step.cmake
+  INSTALL_COMMAND ${CMAKE_COMMAND} -DADDITIONAL_CFLAGS=${LATS_BUILD_ARGS} -Dmake=$(MAKE) -DBUILD_ARGS=${LATS_MAKE_INSTALL_ARGS} -DWORKING_DIR=<SOURCE_DIR> -P ${cdat_CMAKE_BINARY_DIR}/cdat_make_step.cmake
+  DEPENDS ${lats_deps}
+  ${ep_log_options}
+)
+if (DEFINED GIT_CMD_STR_LATS)
+  unset(GIT_CMD_STR_LATS)
+endif()

CMake/cdat_modules/lats_pkg.cmake

@@ -0,0 +1,10 @@
+set(LATS_VERSION 1.0.0)
+set(LATS_BRANCH master)
+set(LATS_REPOSITORY ${GIT_PROTOCOL}github.com/UV-CDAT/lats.git )
+
+set(GIT_CMD_STR_LATS GIT_REPOSITORY ${LATS_REPOSITORY})
+set(GIT_TAG GIT_TAG "${LATS_BRANCH}")
+
+if (CDAT_BUILD_PCMDI)
+  add_cdat_package(lats "" "" ON)
+endif()

CMake/cdat_modules/libcdms_deps.cmake

@@ -1,3 +1,7 @@
 set(libcdms_deps ${netcdf_pkg}
               ${jasper_pkg} ${g2clib_pkg} ${tiff_pkg}
               ${png_pkg} ${jpeg_pkg} )
+if (CDAT_BUILD_LIBDRS)
+    message("[INFO] ADDING LIBDRS TO LIBCDMS DEPNDENCIES")
+    LIST(APPEND libcdms_deps ${libdrs_pkg})
+endif()

CMake/cdat_modules/libcdms_external.cmake

@@ -7,7 +7,14 @@ else()
     set(WITHPNGLIB "no")
 endif()
 
-set(CONFIGURE_ARGS --srcdir=${libcdms_source}^^--enable-dap=^^--enable-drs=no^^--enable-hdf=no^^--enable-pp=yes^^--enable-ql=no^^--cache-file=/dev/null^^--prefix=${libcdms_install}^^--with-nclib=${cdat_EXTERNALS}/lib^^--with-ncinc=${cdat_EXTERNALS}/include^^--with-daplib=/lib^^--with-dapinc=/include^^--with-hdfinc=./include^^--with-hdflib=./lib^^--with-hdf5lib=${cdat_EXTERNALS}/lib^^--with-pnglib=${WITHPNGLIB}^^--with-grib2lib=${cdat_EXTERNALS}/lib^^--with-jasperlib=${cdat_EXTERNALS}/lib^^--with-grib2inc=${cdat_EXTERNALS}/include^^--enable-grib2)
+if (CDAT_BUILD_LIBDRS)
+    message("[INFO] ENBLING DRS IN CDMS")
+    set(drs_opt --enable-drs^^--with-drslib=${cdat_EXTERNALS}/lib^^--with-drsinc=${cdat_EXTERNALS}/include^^--with-drsincf=${cdat_EXTERNALS}/include)
+else()
+    set(drs_opt "")
+endif()
+
+set(CONFIGURE_ARGS --srcdir=${libcdms_source}^^--enable-dap^^${drs_opt}^^--enable-hdf=no^^--enable-pp=yes^^--enable-ql=no^^--cache-file=/dev/null^^--prefix=${libcdms_install}^^--with-nclib=${cdat_EXTERNALS}/lib^^--with-ncinc=${cdat_EXTERNALS}/include^^--with-daplib=/lib^^--with-dapinc=/include^^--with-hdfinc=./include^^--with-hdflib=./lib^^--with-hdf5lib=${cdat_EXTERNALS}/lib^^--with-pnglib=${WITHPNGLIB}^^--with-grib2lib=${cdat_EXTERNALS}/lib^^--with-jasperlib=${cdat_EXTERNALS}/lib^^--with-grib2inc=${cdat_EXTERNALS}/include^^--enable-grib2)
 file(MAKE_DIRECTORY ${cdat_EXTERNALS}/man/man3)
 
 
@@ -21,7 +28,7 @@ else()
     set(URL_STR URL ${LIBCDMS_URL}/${LIBCDMS_GZ})
     set(URL_MD5_STR URL_MD5 ${LIBCDMS_MD5})
     set(GIT_CMD_STR_LIBCDMS )
-    set(GIT_TAG )
+    set(GIT_TAG_LIBCDMS )
 endif()
 set(LIBCDMS_MAKE_ARGS -j1)
 set(LIBCDMS_BUILD_ARGS -fPIC)
@@ -33,7 +40,7 @@ ExternalProject_Add(libcdms
   ${URL_STR}
   ${URL_MD5_STR}
   ${GIT_CMD_STR_LIBCDMS}
-  ${GIT_TAG}
+  ${GIT_TAG_LIBCDMS}
   PATCH_COMMAND ${CMAKE_COMMAND} -E remove <SOURCE_DIR>/zconf.h
   BUILD_IN_SOURCE 1
   CONFIGURE_COMMAND ${CMAKE_COMMAND} -DADDITIONAL_CFLAGS=${LIBCDMS_BUILD_ARGS}  -DCONFIGURE_ARGS=${CONFIGURE_ARGS} -DINSTALL_DIR=<INSTALL_DIR> -DWORKING_DIR=<SOURCE_DIR> -P ${cdat_CMAKE_BINARY_DIR}/cdat_configure_step.cmake

CMake/cdat_modules/libcdms_pkg.cmake

@@ -3,10 +3,10 @@ set(LIBCDMS_URL ${LLNL_URL})
 set(LIBCDMS_GZ libcdms-${LIBCDMS_VERSION}.tar.gz)
 set(LIBCDMS_SOURCE ${LIBCDMS_URL}/${LIBCDMS_GZ})
 set(LIBCDMS_MD5 ce71f54616f755d67fbbb6c81ca4fd62)
-set(LIBCDMS_BRANCH uvcdat-2.4.0)
+set(LIBCDMS_BRANCH master)
 set(LIBCDMS_REPOSITORY ${GIT_PROTOCOL}github.com/UV-CDAT/libcdms.git )
 
 set(GIT_CMD_STR_LIBCDMS GIT_REPOSITORY ${LIBCDMS_REPOSITORY})
-set(GIT_TAG GIT_TAG "${LIBCDMS_BRANCH}")
+set(GIT_TAG_LIBCDMS GIT_TAG "${LIBCDMS_BRANCH}")
 
 add_cdat_package(libcdms "" "" OFF)

CMake/cdat_modules/libdrs_deps.cmake

@@ -1 +1 @@
-
+set(libdrs_deps ${netcdf_pkg} ${g2clib_pkg})

CMake/cdat_modules/libdrs_external.cmake

@@ -0,0 +1,49 @@
+set(libdrs_source "${CMAKE_CURRENT_BINARY_DIR}/build/libdrs")
+set(libdrs_install "${cdat_EXTERNALS}")
+
+if (APPLE)
+    set(libdrs_make_file libdrs_Makefile.Mac.gfortran.in)
+else ()
+    set(libdrs_make_file libdrs_Makefile.Linux.gfortran.in)
+endif ()
+
+configure_file(
+    ${cdat_CMAKE_SOURCE_DIR}/cdat_modules_extra/${libdrs_make_file}
+    ${CMAKE_CURRENT_BINARY_DIR}/CMake/libdrs_Makefile
+    )
+
+if(DEFINED GIT_CMD_STR_LIBDRS )
+    message("[INFO] [libdrs] Installing ${nm} from ${GIT_CMD_STR_LIBDRS}")
+    include(GetGitRevisionDescription)
+    set(URL_STR )
+    set(URL_MD5_STR )
+else()
+    message("[INFO] [libdrs] Installed ${nm} from tarball ${LIBDRS_GZ}")
+    set(URL_STR URL ${LIBDRS_URL}/${LIBDRS_GZ})
+    set(URL_MD5_STR URL_MD5 ${LIBDRS_MD5})
+    set(GIT_CMD_STR_LIBDRS )
+    set(GIT_TAG )
+endif()
+set(LIBDRS_MAKE_ARGS -f^^${CMAKE_CURRENT_BINARY_DIR}/CMake/libdrs_Makefile)
+set(LIBDRS_MAKE_INSTALL_ARGS -f^^${CMAKE_CURRENT_BINARY_DIR}/CMake/libdrs_Makefile^^install)
+set(LIBDRS_BUILD_ARGS -fPIC)
+
+ExternalProject_Add(libdrs
+  LIST_SEPARATOR ^^
+  DOWNLOAD_DIR ${CDAT_PACKAGE_CACHE_DIR}
+  SOURCE_DIR ${libdrs_source}
+  INSTALL_DIR ${libdrs_install}
+  ${URL_STR}
+  ${URL_MD5_STR}
+  ${GIT_CMD_STR_LIBDRS}
+  ${GIT_TAG}
+  BUILD_IN_SOURCE 1
+  CONFIGURE_COMMAND ""
+  BUILD_COMMAND ${CMAKE_COMMAND} -DADDITIONAL_CFLAGS=${LIBDRS_BUILD_ARGS} -Dmake=$(MAKE) -DBUILD_ARGS=${LIBDRS_MAKE_ARGS} -DWORKING_DIR=<SOURCE_DIR>/lib -P ${cdat_CMAKE_BINARY_DIR}/cdat_make_step.cmake
+  INSTALL_COMMAND ${CMAKE_COMMAND} -DADDITIONAL_CFLAGS=${LIBDRS_BUILD_ARGS} -Dmake=$(MAKE) -DBUILD_ARGS=${LIBDRS_MAKE_INSTALL_ARGS} -DWORKING_DIR=<SOURCE_DIR>/lib -P ${cdat_CMAKE_BINARY_DIR}/cdat_make_step.cmake
+  DEPENDS ${libdrs_deps}
+  ${ep_log_options}
+)
+if (DEFINED GIT_CMD_STR_LIBDRS)
+  unset(GIT_CMD_STR_LIBDRS)
+endif()

CMake/cdat_modules/libdrs_pkg.cmake

@@ -1,3 +1,12 @@
-# Added by Charles Doutriaux to build with libdrs support
-option(CDAT_BUILD_WITH_LIBDRS "Build with DRS file format support (needs to be in /usr/local/lib)" OFF)
-MARK_AS_ADVANCED(CDAT_BUILD_WITH_LIBDRS)
+set(LIBDRS_VERSION 1.0.0)
+set(LIBDRS_URL ${LLNL_URL})
+set(LIBDRS_BRANCH master)
+set(LIBDRS_REPOSITORY ${GIT_PROTOCOL}github.com/UV-CDAT/libdrs.git )
+
+set(GIT_CMD_STR_LIBDRS GIT_REPOSITORY ${LIBDRS_REPOSITORY})
+set(GIT_TAG GIT_TAG "${LIBDRS_BRANCH}")
+message("[INFO] PCDMI ${CDAT_BUILD_PCMDI}")
+if (CDAT_BUILD_PCMDI)
+  set(CDAT_BUILD_LIBDRS ON)
+  add_cdat_package(libdrs "" "" ON)
+endif()

CMake/cdat_modules/libdrsfortran_deps.cmake

@@ -0,0 +1 @@
+set(libdrsfortran_deps ${netcdf_pkg} ${g2clib_pkg} ${libcdms_pkg} ${libdrs_pkg})

CMake/cdat_modules/libdrsfortran_external.cmake

@@ -0,0 +1,46 @@
+set(libdrs_source "${CMAKE_CURRENT_BINARY_DIR}/build/libdrs")
+set(libdrs_install "${cdat_EXTERNALS}")
+
+set(libdrsfortran_make_file libdrs_Makefile.Mac.fwrap.gfortran.in)
+
+configure_file(
+    ${cdat_CMAKE_SOURCE_DIR}/cdat_modules_extra/${libdrsfortran_make_file}
+    ${CMAKE_CURRENT_BINARY_DIR}/CMake/libdrsfortran_Makefile
+    )
+
+if(DEFINED GIT_CMD_STR_LIBDRSFORTRAN )
+    message("[INFO] [libdrs] Installing ${nm} from ${GIT_CMD_STR_LIBDRSFORTRAN}")
+    include(GetGitRevisionDescription)
+    set(URL_STR )
+    set(URL_MD5_STR )
+else()
+    message("[INFO] [libdrs] Installed ${nm} from tarball ${LIBDRSFORTRAN_GZ}")
+    set(URL_STR URL ${LIBDRSFORTRAN_URL}/${LIBDRSFORTRAN_GZ})
+    set(URL_MD5_STR URL_MD5 ${LIBDRSFORTRAN_MD5})
+    set(GIT_CMD_STR_LIBDRS )
+    set(GIT_TAG )
+endif()
+
+set(LIBDRS_MAKE_ARGS -f^^${CMAKE_CURRENT_BINARY_DIR}/CMake/libdrsfortran_Makefile)
+set(LIBDRS_MAKE_INSTALL_ARGS -f^^${CMAKE_CURRENT_BINARY_DIR}/CMake/libdrsfortran_Makefile^^install)
+set(LIBDRS_BUILD_ARGS -fPIC)
+
+ExternalProject_Add(libdrsfortran
+  LIST_SEPARATOR ^^
+  DOWNLOAD_DIR ${CDAT_PACKAGE_CACHE_DIR}
+  SOURCE_DIR ${libdrs_source}
+  INSTALL_DIR ${libdrs_install}
+  ${URL_STR}
+  ${URL_MD5_STR}
+  ${GIT_CMD_STR_LIBDRSFORTRAN}
+  ${GIT_TAG}
+  BUILD_IN_SOURCE 1
+  CONFIGURE_COMMAND ""
+  BUILD_COMMAND ${CMAKE_COMMAND} -DADDITIONAL_CFLAGS=${LIBDRS_BUILD_ARGS} -Dmake=$(MAKE) -DBUILD_ARGS=${LIBDRS_MAKE_ARGS} -DWORKING_DIR=<SOURCE_DIR>/lib -P ${cdat_CMAKE_BINARY_DIR}/cdat_make_step.cmake
+  INSTALL_COMMAND ${CMAKE_COMMAND} -DADDITIONAL_CFLAGS=${LIBDRS_BUILD_ARGS} -Dmake=$(MAKE) -DBUILD_ARGS=${LIBDRS_MAKE_INSTALL_ARGS} -DWORKING_DIR=<SOURCE_DIR>/lib -P ${cdat_CMAKE_BINARY_DIR}/cdat_make_step.cmake
+  DEPENDS ${libdrsfortran_deps}
+  ${ep_log_options}
+)
+if (DEFINED GIT_CMD_STR_LIBDRS)
+  unset(GIT_CMD_STR_LIBDRS)
+endif()

CMake/cdat_modules/libdrsfortran_pkg.cmake

@@ -0,0 +1,14 @@
+set(LIBDRSFORTRAN_VERSION 1.0.0)
+set(LIBDRSFORTRAN_URL ${LLNL_URL})
+set(LIBDRSFORTRAN_BRANCH master)
+set(LIBDRSFORTRAN_REPOSITORY ${GIT_PROTOCOL}github.com/UV-CDAT/libdrs.git )
+
+set(GIT_CMD_STR_LIBDRSFORTRAN GIT_REPOSITORY ${LIBDRSFORTRAN_REPOSITORY})
+set(GIT_TAG GIT_TAG "${LIBDRSFORTRAN_BRANCH}")
+message("[INFO] PCDMI ${CDAT_BUILD_PCMDI}")
+if (CDAT_BUILD_PCMDI)
+    if (APPLE)
+        set(CDAT_BUILD_LIBDRSFORTRAN ON)
+        add_cdat_package(libdrsfortran "" "" ON)
+    endif()
+endif()