Updates will be applied on October 27th between 12pm - 12:45pm EDT (UTC-0400). Gitlab may be slow during the maintenance window.

Commit 99982c48 authored by cyrush's avatar cyrush
Browse files

merge from 2.0RC: stricter check for vtk python module & addition of visit-python-config.h

git-svn-id: http://visit.ilight.com/svn/visit/trunk/src@10253 18c085ea-50e0-402c-830e-de6fd14e8384
parent 408fab5f
......@@ -139,8 +139,8 @@ ENDFOREACH(X)
# check for python wrappers
FILE(GLOB VTK_PY_WRAPPERS_DIR ${VTK_LIBRARY_DIRS}/python*/)
IF(EXISTS ${VTK_PY_WRAPPERS_DIR})
MESSAGE(STATUS ${VTK_PY_WRAPPERS_DIR})
IF(EXISTS ${VTK_PY_WRAPPERS_DIR}/site-packages/vtk)
MESSAGE(STATUS "Found VTK Python Wrappers - ${VTK_PY_WRAPPERS_DIR}")
FILE(GLOB VTK_PY_EGG ${VTK_PY_WRAPPERS_DIR}/site-packages/*.egg*)
FILE(GLOB VTK_PY_MODULE ${VTK_PY_WRAPPERS_DIR}/site-packages/vtk)
INSTALL(FILES ${VTK_PY_EGG}
......@@ -175,9 +175,9 @@ IF(EXISTS ${VTK_PY_WRAPPERS_DIR})
ENDIF(APPLE)
SET(VTK_PYTHON_WRAPPERS_FOUND TRUE)
ELSE(EXISTS ${VTK_PY_WRAPPERS_DIR})
ELSE(EXISTS ${VTK_PY_WRAPPERS_DIR}/site-packages/vtk)
SET(VTK_PYTHON_WRAPPERS_FOUND FALSE)
ENDIF(EXISTS ${VTK_PY_WRAPPERS_DIR})
ENDIF(EXISTS ${VTK_PY_WRAPPERS_DIR}/site-packages/vtk)
MARK_AS_ADVANCED(VTK_PYTHON_WRAPPERS_FOUND)
......
......@@ -200,17 +200,6 @@ ENDIF(VISIT_STATIC)
OPTION(VISIT_PYTHON_SCRIPTING "Build VisIt with Python scripting support." ON)
OPTION(VISIT_PYTHON_FILTERS "Build VisIt with Python Engine Filter support." ON)
# VTK Python's wrappers avalaible with the static libs, so we cannot support
# python filters in a static build
IF(VISIT_STATIC AND VISIT_PYTHON_FILTERS)
SET(VISIT_PYTHON_FILTERS OFF)
MESSAGE(STATUS "Python Engine Filters are not supported for static build")
ENDIF(VISIT_STATIC AND VISIT_PYTHON_FILTERS)
IF(VISIT_PYTHON_FILTERS)
ADD_DEFINITIONS(-DVISIT_PYTHON_FILTERS)
ENDIF(VISIT_PYTHON_FILTERS)
OPTION(VISIT_BUILD_ALL_PLUGINS "Build all of VisIt's plugins." OFF)
OPTION(VISIT_BUILD_MINIMAL_PLUGINS "Build a minimal set of VisIt's plugins." OFF)
OPTION(VISIT_ZLIB "Use VisIt's internal libz" OFF)
......@@ -529,6 +518,23 @@ INCLUDE(${VISIT_SOURCE_DIR}/CMake/FindVisItMesa.cmake)
# Configure VTK support.
INCLUDE(${VISIT_SOURCE_DIR}/CMake/FindVisItVTK.cmake)
#-----------------------------------------------------------------------------
# If we are doing a static build or the VTK Python wrappers do not exist:
# Disable python filters.
#-----------------------------------------------------------------------------
# VTK Python's wrappers are not available with a static build of VTK.
IF(VISIT_PYTHON_FILTERS AND VISIT_STATIC)
SET(VISIT_PYTHON_FILTERS OFF)
MESSAGE(STATUS "Python Engine Filters disabled because a static build of VisIt was selected.")
ENDIF(VISIT_PYTHON_FILTERS AND VISIT_STATIC)
# Disable python filters if the VTK Python's wrappers are not found.
IF(VISIT_PYTHON_FILTERS AND NOT VTK_PYTHON_WRAPPERS_FOUND)
SET(VISIT_PYTHON_FILTERS OFF)
MESSAGE(STATUS "Python Engine Filters disabled because VTK python wrappers are not installed.")
ENDIF(VISIT_PYTHON_FILTERS AND NOT VTK_PYTHON_WRAPPERS_FOUND)
# Configure Qt4 support.
INCLUDE(${VISIT_SOURCE_DIR}/CMake/FindVisItQt4.cmake)
......@@ -1143,6 +1149,10 @@ SET(VISIT_RENDERING_SIZE_LIMIT ${OSMESA_SIZE_LIMIT} CACHE INTERNAL "rendering si
CONFIGURE_FILE(${VISIT_SOURCE_DIR}/include/visit-cmake.h.in
${VISIT_BINARY_DIR}/include/visit-config.h @ONLY IMMEDIATE)
CONFIGURE_FILE(${VISIT_SOURCE_DIR}/include/visit-python-cmake.h.in
${VISIT_BINARY_DIR}/include/visit-python-config.h @ONLY IMMEDIATE)
#-----------------------------------------------------------------------------
# Create common/misc/ConfigureInfo.C
#-----------------------------------------------------------------------------
......
......@@ -38,6 +38,10 @@
# Cyrus Harrison,Tue Feb 2 16:35:18 PST 2010
# Added the python filter expression.
#
# Cyrus Harrison, Wed Mar 10 14:28:33 PST 2010
# Use proper python include path ${PYTHON_INCLUDE_PATH}, instead of
# ${PYTHON_INCLUDE_DIRS}
#
#****************************************************************************/
SET(ABSTRACT_SOURCES
......@@ -313,7 +317,7 @@ ${VTK_INCLUDE_DIRS}
IF(VISIT_PYTHON_FILTERS)
INCLUDE_DIRECTORIES(
${PYTHON_INCLUDE_DIRS}
${PYTHON_INCLUDE_PATH}
${VISIT_SOURCE_DIR}/avt/PythonFilters
)
ENDIF(VISIT_PYTHON_FILTERS)
......
......@@ -90,6 +90,7 @@
#include <avtVectorComposeExpression.h>
#include <avtVectorDecomposeExpression.h>
#include <visit-python-config.h>
#ifdef VISIT_PYTHON_FILTERS
#include <avtPythonExpression.h>
#endif
......
......@@ -35,6 +35,9 @@
# DAMAGE.
#
# Modifications:
# Cyrus Harrison, Wed Mar 10 14:28:33 PST 2010
# Use proper python include path ${PYTHON_INCLUDE_PATH}, instead of
# ${PYTHON_INCLUDE_DIRS}
#
#****************************************************************************/
......@@ -59,7 +62,7 @@ ${VISIT_SOURCE_DIR}/avt/DBAtts/MetaData/
${VISIT_SOURCE_DIR}/avt/DBAtts/SIL/
${VISIT_SOURCE_DIR}/visitpy/common/
${VTK_INCLUDE_DIRS}
${PYTHON_INCLUDE_DIRS}
${PYTHON_INCLUDE_PATH}
)
# Add link directories
......
......@@ -38,6 +38,10 @@
# Cyrus Harrison,Tue Feb 2 16:35:18 PST 2010
# Added the python filter query.
#
# Cyrus Harrison, Wed Mar 10 14:28:33 PST 2010
# Use proper python include path ${PYTHON_INCLUDE_PATH}, instead of
# ${PYTHON_INCLUDE_DIRS}
#
#****************************************************************************/
SET(ABSTRACT_SOURCES
......@@ -186,7 +190,7 @@ ${VTK_INCLUDE_DIRS}
IF(VISIT_PYTHON_FILTERS)
INCLUDE_DIRECTORIES(
${PYTHON_INCLUDE_DIRS}
${PYTHON_INCLUDE_PATH}
${VISIT_SOURCE_DIR}/avt/PythonFilters
)
ENDIF(VISIT_PYTHON_FILTERS)
......
......@@ -39,7 +39,6 @@
#include <avtQueryFactory.h>
#include <avtDataObjectQuery.h>
// available queries
#include <avtActualDataMinMaxQuery.h>
#include <avtActualDataNumNodesQuery.h>
......@@ -101,7 +100,7 @@
#include <avtWeightedVariableSummationQuery.h>
#include <avtZoneCenterQuery.h>
#include <visit-python-config.h>
#ifdef VISIT_PYTHON_FILTERS
#include <avtPythonQuery.h>
#endif
......
......@@ -38,7 +38,9 @@
#
#****************************************************************************/
INSTALL(FILES ${VISIT_BINARY_DIR}/include/visit-config.h lite_pdb.h lite_score.h visit-hdf5.h
INSTALL(FILES ${VISIT_BINARY_DIR}/include/visit-config.h
${VISIT_BINARY_DIR}/include/visit-python-config.h
lite_pdb.h lite_score.h visit-hdf5.h
DESTINATION ${VISIT_INSTALLED_VERSION_INCLUDE}/visit/include
PERMISSIONS OWNER_WRITE OWNER_READ GROUP_WRITE GROUP_READ WORLD_READ
)
/*******************************************************************************
* Configure options related to Python Filters
******************************************************************************/
/* Define if Python Filters are enabled */
#cmakedefine VISIT_PYTHON_FILTERS
\ No newline at end of file
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment