changed GIT_CMD_STR name it was creating conflict with pipinstalleR

Author: doutriaux1

CMake/cdat_modules/libcdms_external.cmake

@@ -3,16 +3,16 @@ set(libcdms_install "${cdat_EXTERNALS}")
 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-grib2lib=${cdat_EXTERNALS}/lib^^--with-jasperlib=${cdat_EXTERNALS}/lib^^--with-grib2inc=${cdat_EXTERNALS}/include^^--enable-grib2)
 file(MAKE_DIRECTORY ${cdat_EXTERNALS}/man/man3)
 
-if(DEFINED GIT_CMD_STR )
-    message("[INFO] [libcdms] Installing ${nm} from ${GIT_CMD_STR}")
+if(DEFINED GIT_CMD_STR_LIBCDMS )
+    message("[INFO] [libcdms] Installing ${nm} from ${GIT_CMD_STR_LIBCDMS}")
     include(GetGitRevisionDescription)
     set(URL_STR )
     set(URL_MD5_STR )
 else()
     message("[INFO] [libcdms] Installed ${nm} from tarball ${LIBCDMS_GZ}")
     set(URL_STR URL ${LIBCDMS_URL}/${LIBCDMS_GZ})
     set(URL_MD5_STR URL_MD5 ${LIBCDMS_MD5})
-    set(GIT_CMD_STR )
+    set(GIT_CMD_STR_LIBCDMS )
     set(GIT_TAG )
 endif()
 set(LIBCDMS_MAKE_ARGS -j1)
@@ -24,7 +24,7 @@ ExternalProject_Add(libcdms
   INSTALL_DIR ${libcdms_install}
   ${URL_STR}
   ${URL_MD5_STR}
-  ${GIT_CMD_STR}
+  ${GIT_CMD_STR_LIBCDMS}
   ${GIT_TAG}
   PATCH_COMMAND ${CMAKE_COMMAND} -E remove <SOURCE_DIR>/zconf.h
   BUILD_IN_SOURCE 1
@@ -33,6 +33,6 @@ ExternalProject_Add(libcdms
   DEPENDS ${libcdms_deps}
   ${ep_log_options}
 )
-if (DEFINED GIT_CMD_STR)
-  unset(GIT_CMD_STR)
+if (DEFINED GIT_CMD_STR_LIBCDMS)
+  unset(GIT_CMD_STR_LIBCDMS)
 endif()

CMake/cdat_modules/libcdms_pkg.cmake

@@ -6,7 +6,7 @@ set(LIBCDMS_MD5 ce71f54616f755d67fbbb6c81ca4fd62)
 set(LIBCDMS_BRANCH master)
 set(LIBCDMS_REPOSITORY ${GIT_PROTOCOL}github.com/UV-CDAT/libcdms.git )
 
-set(GIT_CMD_STR GIT_REPOSITORY ${LIBCDMS_REPOSITORY})
+set(GIT_CMD_STR_LIBCDMS GIT_REPOSITORY ${LIBCDMS_REPOSITORY})
 set(GIT_TAG GIT_TAG "${LIBCDMS_BRANCH}")
 
 add_cdat_package(libcdms "" "" OFF)