From 8a05b3fbf746e0200f896a6292312f4991967907 Mon Sep 17 00:00:00 2001 From: "Paul J. Durack" Date: Wed, 25 Feb 2015 21:24:51 -0800 Subject: [PATCH 1/7] Fix #423 - Correct vacumm dependencies for tarball installation --- CMake/cdat_modules/vacumm_deps.cmake | 1 + 1 file changed, 1 insertion(+) create mode 100644 CMake/cdat_modules/vacumm_deps.cmake diff --git a/CMake/cdat_modules/vacumm_deps.cmake b/CMake/cdat_modules/vacumm_deps.cmake new file mode 100644 index 0000000000..342eeb0a06 --- /dev/null +++ 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}) From b8757bc669c686757446e583f8460f7ce9d20cfc Mon Sep 17 00:00:00 2001 From: "Paul J. Durack" Date: Thu, 26 Feb 2015 15:02:55 -0800 Subject: [PATCH 2/7] Updated six to 1.9.0 --- CMake/cdat_modules/six_pkg.cmake | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/CMake/cdat_modules/six_pkg.cmake b/CMake/cdat_modules/six_pkg.cmake index 8641841df4..e8daac58a6 100644 --- 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) From 4dcc445c4bc60e9a023921d140aacae37470db7a Mon Sep 17 00:00:00 2001 From: "Paul J. Durack" Date: Thu, 26 Feb 2015 15:16:03 -0800 Subject: [PATCH 3/7] Updated to include configobj 5.0.6 --- CMake/cdat_modules/configobj_deps.cmake | 1 + CMake/cdat_modules/configobj_external.cmake | 24 +++++++++++++++++++ CMake/cdat_modules/configobj_pkg.cmake | 18 ++++++++++++++ .../configobj_build_step.cmake.in | 6 +++++ CMakeLists.txt | 1 + 5 files changed, 50 insertions(+) create mode 100644 CMake/cdat_modules/configobj_deps.cmake create mode 100644 CMake/cdat_modules/configobj_external.cmake create mode 100644 CMake/cdat_modules/configobj_pkg.cmake create mode 100644 CMake/cdat_modules_extra/configobj_build_step.cmake.in diff --git a/CMake/cdat_modules/configobj_deps.cmake b/CMake/cdat_modules/configobj_deps.cmake new file mode 100644 index 0000000000..b4c7d10430 --- /dev/null +++ b/CMake/cdat_modules/configobj_deps.cmake @@ -0,0 +1 @@ +set(configobj_deps ${python_pkg} ${six_pkg}) diff --git a/CMake/cdat_modules/configobj_external.cmake b/CMake/cdat_modules/configobj_external.cmake new file mode 100644 index 0000000000..ce77c8f039 --- /dev/null +++ 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 new file mode 100644 index 0000000000..e301132188 --- /dev/null +++ b/CMake/cdat_modules/configobj_pkg.cmake @@ -0,0 +1,18 @@ +set( CONFIGOBJ_MAJOR 2 ) +set( CONFIGOBJ_MINOR 4 ) +set( CONFIGOBJ_PATCH 0 ) +set( CONFIGOBJ_VERSION ${CONFIGOBJ_MAJOR}.${CONFIGOBJ_MINOR}.${CONFIGOBJ_PATCH} ) +set( CONFIGOBJ_URL ${LLNL_URL} ) +set( CONFIGOBJ_GZ h5py-${H5PY_VERSION}.tar.gz ) +set( CONFIGOBJ_MD5 80c9a94ae31f84885cc2ebe1323d6758) + +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_extra/configobj_build_step.cmake.in b/CMake/cdat_modules_extra/configobj_build_step.cmake.in new file mode 100644 index 0000000000..5edd0af433 --- /dev/null +++ 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 index 4c192610c8..7946b3fc4d 100644 --- 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) From 93e11c286d4fdd20cd6361c72177ec299c0b39b8 Mon Sep 17 00:00:00 2001 From: "Paul J. Durack" Date: Thu, 26 Feb 2015 15:34:39 -0800 Subject: [PATCH 4/7] Corrected configobj_pkg.cmake to include correct info --- CMake/cdat_modules/configobj_pkg.cmake | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/CMake/cdat_modules/configobj_pkg.cmake b/CMake/cdat_modules/configobj_pkg.cmake index e301132188..c236b86948 100644 --- a/CMake/cdat_modules/configobj_pkg.cmake +++ b/CMake/cdat_modules/configobj_pkg.cmake @@ -1,10 +1,10 @@ -set( CONFIGOBJ_MAJOR 2 ) -set( CONFIGOBJ_MINOR 4 ) -set( CONFIGOBJ_PATCH 0 ) +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 h5py-${H5PY_VERSION}.tar.gz ) -set( CONFIGOBJ_MD5 80c9a94ae31f84885cc2ebe1323d6758) +set( CONFIGOBJ_GZ configobj-${CONFIGOBJ_VERSION}.tar.gz ) +set( CONFIGOBJ_MD5 e472a3a1c2a67bb0ec9b5d54c13a47d6 ) set (nm CONFIGOBJ) string(TOUPPER ${nm} uc_nm) From 0a5764427d2b6cb0d15509a86ee8b423126fcf69 Mon Sep 17 00:00:00 2001 From: "Paul J. Durack" Date: Tue, 3 Mar 2015 09:01:30 -0800 Subject: [PATCH 5/7] Fix #423 - Update to vacumm 2.5.1 to reduce dependencies --- CMake/cdat_modules/vacumm_pkg.cmake | 18 ++++++++++++++++++ 1 file changed, 18 insertions(+) create mode 100644 CMake/cdat_modules/vacumm_pkg.cmake diff --git a/CMake/cdat_modules/vacumm_pkg.cmake b/CMake/cdat_modules/vacumm_pkg.cmake new file mode 100644 index 0000000000..f873e76ca1 --- /dev/null +++ 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() From bd5f6b642b424b5e3dbae61cfd7b48b5726eddba Mon Sep 17 00:00:00 2001 From: "Paul J. Durack" Date: Tue, 3 Mar 2015 11:07:19 -0800 Subject: [PATCH 6/7] Fix #423 - Added setuptools dependency for configobj and vacumm --- CMake/cdat_modules/configobj_deps.cmake | 2 +- CMake/cdat_modules/vacumm_deps.cmake | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/CMake/cdat_modules/configobj_deps.cmake b/CMake/cdat_modules/configobj_deps.cmake index b4c7d10430..1835fd3b45 100644 --- a/CMake/cdat_modules/configobj_deps.cmake +++ b/CMake/cdat_modules/configobj_deps.cmake @@ -1 +1 @@ -set(configobj_deps ${python_pkg} ${six_pkg}) +set(configobj_deps ${python_pkg} ${six_pkg} ${setuptools_pkg}) diff --git a/CMake/cdat_modules/vacumm_deps.cmake b/CMake/cdat_modules/vacumm_deps.cmake index 342eeb0a06..9472871dd1 100644 --- a/CMake/cdat_modules/vacumm_deps.cmake +++ b/CMake/cdat_modules/vacumm_deps.cmake @@ -1 +1 @@ -set(vacumm_deps ${python_pkg} ${numpy_pkg} ${scipy_pkg} ${matplotlib_pkg} ${basemap_pkg} ${configobj_pkg}) +set(vacumm_deps ${python_pkg} ${numpy_pkg} ${scipy_pkg} ${matplotlib_pkg} ${basemap_pkg} ${configobj_pkg} ${setuptools_pkg}) From 464608dc19848e791256fc62653c86014316c83b Mon Sep 17 00:00:00 2001 From: "Paul J. Durack" Date: Wed, 4 Mar 2015 10:01:36 -0800 Subject: [PATCH 7/7] Adding vacumm_pkg back into CMakeLists.txt --- CMakeLists.txt | 1 + 1 file changed, 1 insertion(+) diff --git a/CMakeLists.txt b/CMakeLists.txt index 7946b3fc4d..99dc8a904c 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -490,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()