Skip to content

Commit

Permalink
Fix #423 - Added python vacumm library
Browse files Browse the repository at this point in the history
  • Loading branch information
durack1 committed Feb 24, 2015
1 parent a321697 commit ea311b8
Show file tree
Hide file tree
Showing 5 changed files with 50 additions and 0 deletions.
1 change: 1 addition & 0 deletions CMake/cdat_modules/vacumm_deps.cmake
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
set(vacumm ${vacumm_pkg} ${python_pkg})
24 changes: 24 additions & 0 deletions CMake/cdat_modules/vacumm_external.cmake
Original file line number Diff line number Diff line change
@@ -0,0 +1,24 @@
# vacumm
#
set(vacumm_source_dir "${CMAKE_CURRENT_BINARY_DIR}/build/vacumm")

configure_file(
"${cdat_CMAKE_SOURCE_DIR}/cdat_modules_extra/vacumm_build_step.cmake.in"
"${cdat_CMAKE_BINARY_DIR}/vacumm_build_step.cmake"
@ONLY
)

set(vacumm_build_command ${CMAKE_COMMAND} -P ${cdat_CMAKE_BINARY_DIR}/vacumm_build_step.cmake)

ExternalProject_Add(vacumm
DOWNLOAD_DIR ${CDAT_PACKAGE_CACHE_DIR}
SOURCE_DIR ${vacumm_source_dir}
URL ${VACUMM_URL}/${VACUMM_GZ}
URL_MD5 ${VACUMM_MD5}
BUILD_IN_SOURCE 1
CONFIGURE_COMMAND ""
BUILD_COMMAND ${vacumm_build_command}
INSTALL_COMMAND ""
DEPENDS ${vacumm_deps}
${ep_log_options}
)
18 changes: 18 additions & 0 deletions CMake/cdat_modules/vacumm_pkg.cmake
Original file line number Diff line number Diff line change
@@ -0,0 +1,18 @@
set( VACUMM_MAJOR 2 )
set( VACUMM_MINOR 5 )
set( VACUMM_PATCH 0-svn1791 )
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 9e9f8a1b66b4dcfa4e21519f6e5ed348 )

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()
6 changes: 6 additions & 0 deletions CMake/cdat_modules_extra/vacumm_build_step.cmake.in
Original file line number Diff line number Diff line change
@@ -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 "@vacumm_source_dir@"
)
1 change: 1 addition & 0 deletions CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -487,6 +487,7 @@ include(numpy_pkg)
include(mpi_pkg)
include(osmesa_pkg)
include(python_pkg)
include(vacumm_pkg)
if (CDAT_BUILD_PARALLEL)
include(paraview_pkg)
else()
Expand Down

0 comments on commit ea311b8

Please sign in to comment.