Merge pull request #1089 from durack1/issue423_durack1_FixVacummDepen…

…dencies Issue423 durack1 fix vacumm dependencies
CDAT · Mar 4, 2015 · 8b03872 · 8b03872
2 parents a4a7e23 + 464608d
commit 8b03872
Show file tree

Hide file tree

Showing 8 changed files with 73 additions and 3 deletions.
diff --git a/CMake/cdat_modules/configobj_deps.cmake b/CMake/cdat_modules/configobj_deps.cmake
@@ -0,0 +1 @@
+set(configobj_deps ${python_pkg} ${six_pkg} ${setuptools_pkg})
diff --git a/CMake/cdat_modules/configobj_external.cmake b/CMake/cdat_modules/configobj_external.cmake
@@ -0,0 +1,24 @@
+# configobj
+#
+set(configobj_source_dir "${CMAKE_CURRENT_BINARY_DIR}/build/configobj")
+
+configure_file(
+  "${cdat_CMAKE_SOURCE_DIR}/cdat_modules_extra/configobj_build_step.cmake.in"
+  "${cdat_CMAKE_BINARY_DIR}/configobj_build_step.cmake"
+  @ONLY
+)
+
+set(configobj_build_command ${CMAKE_COMMAND} -P ${cdat_CMAKE_BINARY_DIR}/configobj_build_step.cmake)
+
+ExternalProject_Add(configobj
+  DOWNLOAD_DIR ${CDAT_PACKAGE_CACHE_DIR}
+  SOURCE_DIR ${configobj_source_dir}
+  URL ${CONFIGOBJ_URL}/${CONFIGOBJ_GZ}
+  URL_MD5 ${CONFIGOBJ_MD5}
+  BUILD_IN_SOURCE 1
+  CONFIGURE_COMMAND ""
+  BUILD_COMMAND ${configobj_build_command}
+  INSTALL_COMMAND ""
+  DEPENDS ${configobj_deps}
+  ${ep_log_options}
+)
diff --git a/CMake/cdat_modules/configobj_pkg.cmake b/CMake/cdat_modules/configobj_pkg.cmake
@@ -0,0 +1,18 @@
+set( CONFIGOBJ_MAJOR 5 )
+set( CONFIGOBJ_MINOR 0 )
+set( CONFIGOBJ_PATCH 6 )
+set( CONFIGOBJ_VERSION ${CONFIGOBJ_MAJOR}.${CONFIGOBJ_MINOR}.${CONFIGOBJ_PATCH} )
+set( CONFIGOBJ_URL ${LLNL_URL} )
+set( CONFIGOBJ_GZ configobj-${CONFIGOBJ_VERSION}.tar.gz )
+set( CONFIGOBJ_MD5 e472a3a1c2a67bb0ec9b5d54c13a47d6 )
+
+set (nm CONFIGOBJ)
+string(TOUPPER ${nm} uc_nm)
+set(${uc_nm}_VERSION ${${nm}_MAJOR}.${${nm}_MINOR}.${${nm}_PATCH})
+set(CONFIGOBJ_SOURCE ${CONFIGOBJ_URL}/${CONFIGOBJ_GZ})
+
+if (CDAT_BUILD_ALL)
+  add_cdat_package(configobj "" "" ON)
+else()
+  add_cdat_package(configobj "" "" OFF)
+endif()
diff --git a/CMake/cdat_modules/six_pkg.cmake b/CMake/cdat_modules/six_pkg.cmake
@@ -1,10 +1,10 @@
 set(SIX_MAJOR_SRC 1)
-set(SIX_MINOR_SRC 7)
-set(SIX_PATCH_SRC 2)
+set(SIX_MINOR_SRC 9)
+set(SIX_PATCH_SRC 0)
 
 set(SIX_VERSION ${SIX_MAJOR_SRC}.${SIX_MINOR_SRC}.${SIX_PATCH_SRC})
 set(SIX_GZ six-${SIX_VERSION}.tar.gz)
 set(SIX_SOURCE ${LLNL_URL}/${SIX_GZ})
-set(SIX_MD5 4c26276583b01dfc73474cb32327af91)
+set(SIX_MD5 476881ef4012262dfc8adc645ee786c4)
 
 add_cdat_package_dependent(SIX "" "" ON "CDAT_BUILD_LEAN" OFF)
diff --git a/CMake/cdat_modules/vacumm_deps.cmake b/CMake/cdat_modules/vacumm_deps.cmake
@@ -0,0 +1 @@
+set(vacumm_deps ${python_pkg} ${numpy_pkg} ${scipy_pkg} ${matplotlib_pkg} ${basemap_pkg} ${configobj_pkg} ${setuptools_pkg})
diff --git a/CMake/cdat_modules/vacumm_pkg.cmake b/CMake/cdat_modules/vacumm_pkg.cmake
@@ -0,0 +1,18 @@
+set( VACUMM_MAJOR 2 )
+set( VACUMM_MINOR 5 )
+set( VACUMM_PATCH 1-svn1807 )
+set( VACUMM_VERSION ${VACUMM_MAJOR}.${VACUMM_MINOR}.${VACUMM_PATCH} )
+set( VACUMM_URL ${LLNL_URL} )
+set( VACUMM_GZ vacumm-${VACUMM_VERSION}.tar.gz )
+set( VACUMM_MD5 9da3f6c29a86e29c0e6e3799fd9ef378 )
+
+set (nm VACUMM)
+string(TOUPPER ${nm} uc_nm)
+set(${uc_nm}_VERSION ${${nm}_MAJOR}.${${nm}_MINOR}.${${nm}_PATCH})
+set(VACUMM_SOURCE ${VACUMM_URL}/${VACUMM_GZ})
+
+if (CDAT_BUILD_ALL)
+  add_cdat_package(vacumm "" "" ON)
+else()
+  add_cdat_package(vacumm "" "" OFF)
+endif()
diff --git a/CMake/cdat_modules_extra/configobj_build_step.cmake.in b/CMake/cdat_modules_extra/configobj_build_step.cmake.in
@@ -0,0 +1,6 @@
+include(@cdat_CMAKE_BINARY_DIR@/cdat_common_environment.cmake)
+
+execute_process(
+  COMMAND "@PYTHON_EXECUTABLE@" setup.py install @PYTHON_EXTRA_PREFIX@
+  WORKING_DIRECTORY "@configobj_source_dir@"
+)
diff --git a/CMakeLists.txt b/CMakeLists.txt
@@ -450,6 +450,7 @@ set(found_system_libraries)
 include(basemap_pkg)
 include(cdat_pkg)
 include(clapack_pkg)
+include(configobj_pkg)
 include(curl_pkg)
 include(cython_pkg)
 include(data_pkg)
@@ -489,6 +490,7 @@ include(mpi_pkg)
 include(osmesa_pkg)
 include(python_pkg)
 include(seawater_pkg)
+include(vacumm_pkg)
 if (CDAT_BUILD_PARALLEL)
   include(paraview_pkg)
 else()
Original file line number	Diff line number	Diff line change
		@@ -0,0 +1 @@
		set(configobj_deps ${python_pkg} ${six_pkg} ${setuptools_pkg})
Original file line number	Diff line number	Diff line change
		@@ -0,0 +1 @@
		set(vacumm_deps ${python_pkg} ${numpy_pkg} ${scipy_pkg} ${matplotlib_pkg} ${basemap_pkg} ${configobj_pkg} ${setuptools_pkg})