Skip to content

Commit 8b03872

Browse files
doutriaux1doutriaux1
committed
Merge pull request #1089 from durack1/issue423_durack1_FixVacummDependencies
Issue423 durack1 fix vacumm dependencies
2 parents a4a7e23 + 464608d commit 8b03872

File tree

8 files changed

+73
-3
lines changed

8 files changed

+73
-3
lines changed

‎CMake/cdat_modules/configobj_deps.cmake‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
set(configobj_deps ${python_pkg} ${six_pkg} ${setuptools_pkg})

‎CMake/cdat_modules/configobj_external.cmake‎

Lines changed: 24 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,24 @@
1+
# configobj
2+
#
3+
set(configobj_source_dir "${CMAKE_CURRENT_BINARY_DIR}/build/configobj")
4+
5+
configure_file(
6+
"${cdat_CMAKE_SOURCE_DIR}/cdat_modules_extra/configobj_build_step.cmake.in"
7+
"${cdat_CMAKE_BINARY_DIR}/configobj_build_step.cmake"
8+
@ONLY
9+
)
10+
11+
set(configobj_build_command ${CMAKE_COMMAND} -P ${cdat_CMAKE_BINARY_DIR}/configobj_build_step.cmake)
12+
13+
ExternalProject_Add(configobj
14+
DOWNLOAD_DIR ${CDAT_PACKAGE_CACHE_DIR}
15+
SOURCE_DIR ${configobj_source_dir}
16+
URL ${CONFIGOBJ_URL}/${CONFIGOBJ_GZ}
17+
URL_MD5 ${CONFIGOBJ_MD5}
18+
BUILD_IN_SOURCE 1
19+
CONFIGURE_COMMAND ""
20+
BUILD_COMMAND ${configobj_build_command}
21+
INSTALL_COMMAND ""
22+
DEPENDS ${configobj_deps}
23+
${ep_log_options}
24+
)

‎CMake/cdat_modules/configobj_pkg.cmake‎

Lines changed: 18 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,18 @@
1+
set( CONFIGOBJ_MAJOR 5 )
2+
set( CONFIGOBJ_MINOR 0 )
3+
set( CONFIGOBJ_PATCH 6 )
4+
set( CONFIGOBJ_VERSION ${CONFIGOBJ_MAJOR}.${CONFIGOBJ_MINOR}.${CONFIGOBJ_PATCH} )
5+
set( CONFIGOBJ_URL ${LLNL_URL} )
6+
set( CONFIGOBJ_GZ configobj-${CONFIGOBJ_VERSION}.tar.gz )
7+
set( CONFIGOBJ_MD5 e472a3a1c2a67bb0ec9b5d54c13a47d6 )
8+
9+
set (nm CONFIGOBJ)
10+
string(TOUPPER ${nm} uc_nm)
11+
set(${uc_nm}_VERSION ${${nm}_MAJOR}.${${nm}_MINOR}.${${nm}_PATCH})
12+
set(CONFIGOBJ_SOURCE ${CONFIGOBJ_URL}/${CONFIGOBJ_GZ})
13+
14+
if (CDAT_BUILD_ALL)
15+
add_cdat_package(configobj "" "" ON)
16+
else()
17+
add_cdat_package(configobj "" "" OFF)
18+
endif()

‎CMake/cdat_modules/six_pkg.cmake‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,10 @@
11
set(SIX_MAJOR_SRC 1)
2-
set(SIX_MINOR_SRC 7)
3-
set(SIX_PATCH_SRC 2)
2+
set(SIX_MINOR_SRC 9)
3+
set(SIX_PATCH_SRC 0)
44

55
set(SIX_VERSION ${SIX_MAJOR_SRC}.${SIX_MINOR_SRC}.${SIX_PATCH_SRC})
66
set(SIX_GZ six-${SIX_VERSION}.tar.gz)
77
set(SIX_SOURCE ${LLNL_URL}/${SIX_GZ})
8-
set(SIX_MD5 4c26276583b01dfc73474cb32327af91)
8+
set(SIX_MD5 476881ef4012262dfc8adc645ee786c4)
99

1010
add_cdat_package_dependent(SIX "" "" ON "CDAT_BUILD_LEAN" OFF)

‎CMake/cdat_modules/vacumm_deps.cmake‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
set(vacumm_deps ${python_pkg} ${numpy_pkg} ${scipy_pkg} ${matplotlib_pkg} ${basemap_pkg} ${configobj_pkg} ${setuptools_pkg})

‎CMake/cdat_modules/vacumm_pkg.cmake‎

Lines changed: 18 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,18 @@
1+
set( VACUMM_MAJOR 2 )
2+
set( VACUMM_MINOR 5 )
3+
set( VACUMM_PATCH 1-svn1807 )
4+
set( VACUMM_VERSION ${VACUMM_MAJOR}.${VACUMM_MINOR}.${VACUMM_PATCH} )
5+
set( VACUMM_URL ${LLNL_URL} )
6+
set( VACUMM_GZ vacumm-${VACUMM_VERSION}.tar.gz )
7+
set( VACUMM_MD5 9da3f6c29a86e29c0e6e3799fd9ef378 )
8+
9+
set (nm VACUMM)
10+
string(TOUPPER ${nm} uc_nm)
11+
set(${uc_nm}_VERSION ${${nm}_MAJOR}.${${nm}_MINOR}.${${nm}_PATCH})
12+
set(VACUMM_SOURCE ${VACUMM_URL}/${VACUMM_GZ})
13+
14+
if (CDAT_BUILD_ALL)
15+
add_cdat_package(vacumm "" "" ON)
16+
else()
17+
add_cdat_package(vacumm "" "" OFF)
18+
endif()

‎CMake/cdat_modules_extra/configobj_build_step.cmake.in‎

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,6 @@
1+
include(@cdat_CMAKE_BINARY_DIR@/cdat_common_environment.cmake)
2+
3+
execute_process(
4+
COMMAND "@PYTHON_EXECUTABLE@" setup.py install @PYTHON_EXTRA_PREFIX@
5+
WORKING_DIRECTORY "@configobj_source_dir@"
6+
)

‎CMakeLists.txt‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -450,6 +450,7 @@ set(found_system_libraries)
450450
include(basemap_pkg)
451451
include(cdat_pkg)
452452
include(clapack_pkg)
453+
include(configobj_pkg)
453454
include(curl_pkg)
454455
include(cython_pkg)
455456
include(data_pkg)
@@ -489,6 +490,7 @@ include(mpi_pkg)
489490
include(osmesa_pkg)
490491
include(python_pkg)
491492
include(seawater_pkg)
493+
include(vacumm_pkg)
492494
if (CDAT_BUILD_PARALLEL)
493495
include(paraview_pkg)
494496
else()

0 commit comments

Comments
 (0)