Commit bed74111 authored by cyrush's avatar cyrush
Browse files

merge from 2.0RC: merge kathleen's changes picked up by my last merge

git-svn-id: http://visit.ilight.com/svn/visit/trunk/src@10378 18c085ea-50e0-402c-830e-de6fd14e8384
parent a1d6fca6
......@@ -46,8 +46,11 @@
# Kathleen Bonnell, Thu Dec 10 17:50:01 MT 2009
# Removed MSVC_VERSION from searchpath in favor of 'libs' for windows.
#
# Gunther H. Weber, Fri Jan 29 12:00:39 PST 2010
# Only install Python if we are not using the system Python.
# Gunther H. Weber, Fri Jan 29 12:00:39 PST 2010
# Only install Python if we are not using the system Python.
#
# Kathleen Bonnell, Wed Mar 17 10:01:22 MT 2010
# Exclude '.svn' from being included when installing directories.
#
#****************************************************************************/
......@@ -305,6 +308,7 @@ IF(PYTHONLIBS_FOUND)
DESTINATION ${VISIT_INSTALLED_VERSION_INCLUDE}/python/include
FILE_PERMISSIONS OWNER_WRITE OWNER_READ GROUP_WRITE GROUP_READ WORLD_READ
DIRECTORY_PERMISSIONS OWNER_WRITE OWNER_READ OWNER_EXECUTE GROUP_WRITE GROUP_READ GROUP_EXECUTE WORLD_READ WORLD_EXECUTE
PATTERN ".svn" EXCLUDE
)
ENDIF((NOT ${PYTHON_DIR} STREQUAL "/usr"))
ENDIF(Python_FRAMEWORKS)
......
......@@ -44,6 +44,11 @@
# Cyrus Harrison, Tue Mar 9 07:51:00 PST 2010
# Added install_name_tool patch of of vtk python wrappers (if they exist)
#
# Kathleen Bonnell, Wed Mar 17 10:03:52 MST 2010
# Prevent '.svn' from being included when installing directories.
# Change how python wrappers are handled on windows, due to different
# VTK directory structure.
#
#****************************************************************************/
INCLUDE(${VISIT_SOURCE_DIR}/CMake/ThirdPartyInstallLibrary.cmake)
......@@ -127,17 +132,23 @@ FOREACH(X ${VTK_INCLUDE_DIRS})
DESTINATION ${VISIT_INSTALLED_VERSION_INCLUDE}/vtk/include
FILE_PERMISSIONS OWNER_WRITE OWNER_READ GROUP_WRITE GROUP_READ WORLD_READ
DIRECTORY_PERMISSIONS OWNER_WRITE OWNER_READ OWNER_EXECUTE GROUP_WRITE GROUP_READ GROUP_EXECUTE WORLD_READ WORLD_EXECUTE
PATTERN ".svn" EXCLUDE
)
INSTALL(DIRECTORY ${X}/../MangleMesaInclude
DESTINATION ${VISIT_INSTALLED_VERSION_INCLUDE}/vtk/include
FILE_PERMISSIONS OWNER_WRITE OWNER_READ GROUP_WRITE GROUP_READ WORLD_READ
DIRECTORY_PERMISSIONS OWNER_WRITE OWNER_READ OWNER_EXECUTE GROUP_WRITE GROUP_READ GROUP_EXECUTE WORLD_READ WORLD_EXECUTE
PATTERN ".svn" EXCLUDE
)
ENDIF(EXISTS ${X}/vtkActor.h)
ENDFOREACH(X)
# check for python wrappers
FILE(GLOB VTK_PY_WRAPPERS_DIR ${VTK_LIBRARY_DIRS}/python*/)
IF (NOT WIN32)
FILE(GLOB VTK_PY_WRAPPERS_DIR ${VTK_LIBRARY_DIRS}/python*/)
ELSE (NOT WIN32)
FILE(GLOB VTK_PY_WRAPPERS_DIR ${VTK_LIBRARY_DIRS})
ENDIF (NOT WIN32)
IF(EXISTS ${VTK_PY_WRAPPERS_DIR}/site-packages/vtk)
MESSAGE(STATUS "Found VTK Python Wrappers - ${VTK_PY_WRAPPERS_DIR}")
......@@ -152,6 +163,7 @@ IF(EXISTS ${VTK_PY_WRAPPERS_DIR}/site-packages/vtk)
DESTINATION ${VISIT_INSTALLED_VERSION_LIB}/site-packages/
FILE_PERMISSIONS OWNER_WRITE OWNER_READ GROUP_WRITE GROUP_READ WORLD_READ
DIRECTORY_PERMISSIONS OWNER_WRITE OWNER_READ OWNER_EXECUTE GROUP_WRITE GROUP_READ GROUP_EXECUTE WORLD_READ WORLD_EXECUTE
PATTERN ".svn" EXCLUDE
)
#
# On OSX we need to patch the lib names in the vtk python wrappers.
......
......@@ -88,9 +88,12 @@
# Cyrus Harrison, Tue Mar 9 08:02:50 PST 2010
# Enabled python filters support by default.
#
# Kathleen Bonnell, Wed Mar 17 10:06:44 MST 2010
# Change cmake minimum required to 2.8.0, to support FILE(COPY .
#
#****************************************************************************/
CMAKE_MINIMUM_REQUIRED(VERSION 2.6.4 FATAL_ERROR)
CMAKE_MINIMUM_REQUIRED(VERSION 2.8.0 FATAL_ERROR)
IF (COMMAND cmake_policy)
cmake_policy(SET CMP0003 NEW)
......
......@@ -36,10 +36,20 @@
*
*****************************************************************************/
// ****************************************************************************
// Modifications:
//
// Kathleen Bonnell, Mon Mar 15 13:50:27 MST 2010
// Use AVTPYTHON_FILTERS_API for proper symbol export an all platforms.
//
// ****************************************************************************
#ifndef PY_CONTRACT_H
#define PY_CONTRACT_H
#include <avtContract.h>
#include <python_filters_exports.h>
// Forward Declare PyObject*
#ifndef PyObject_HEAD
......@@ -54,11 +64,7 @@ typedef _object PyObject;
bool PyContract_Check(PyObject *obj);
avtContract_p PyContract_FromPyObject(PyObject *obj);
PyObject
#if __GNUC__ >= 4
/* Ensure this function is visible even if -fvisibility=hidden was passed */
__attribute__ ((visibility("default")))
#endif
*PyContract_Wrap(avtContract_p contract);
PyObject AVTPYTHON_FILTERS_API *PyContract_Wrap(avtContract_p contract);
#endif
......@@ -42,6 +42,10 @@
# Kathleen Bonnell, Wed Feb 3 17:22:12 PST 2010
# Add install for visit_exe.
#
# Kathleen Bonnell, Sun Mar 14 14:06:51 MST 2010
# Change copy_directory for VISIT_BIN_DIRECTORIES to a FILE(COPY
# so that '.svn' can be skipped.
#
#****************************************************************************/
#-----------------------------------------------------------------------------
......@@ -82,9 +86,12 @@ SET(VISIT_BIN_FILES
xmltest)
FOREACH(VISIT_BIN_ITEM ${VISIT_BIN_DIRECTORIES})
EXECUTE_PROCESS(COMMAND ${CMAKE_COMMAND} -E copy_directory
${CMAKE_CURRENT_SOURCE_DIR}/${VISIT_BIN_ITEM}
${CMAKE_CURRENT_BINARY_DIR}/${VISIT_BIN_ITEM})
# Resolve symlink
GET_FILENAME_COMPONENT(ITM_RP ${CMAKE_CURRENT_SOURCE_DIR}/${VISIT_BIN_ITEM}
REALPATH)
FILE(COPY ${ITM_RP}
DESTINATION ${CMAKE_CURRENT_BINARY_DIR}
PATTERN ".svn" EXCLUDE)
ENDFOREACH(VISIT_BIN_ITEM)
FOREACH(VISIT_BIN_ITEM ${VISIT_BIN_FILES} internallauncher)
......
......@@ -61,28 +61,54 @@
# Cyrus Harrison, Wed Feb 3 10:10:22 PST 2010
# Add symlinks to allow us to locate the vtk python wrapper module.
#
# Kathleen Bonnell, Wed Mar 17 10:08:17 MST 2010
# Use FILE(COPY ...) on windows, as windows doesn't support symlinks.
# Handled python filters on windows differently, as the VTK directory
# structure is different.
#
#----------------------------------------------------------------------------
FOREACH(LIB ${MESA_LIB})
EXECUTE_PROCESS(COMMAND ${CMAKE_COMMAND} -E create_symlink
${MESA_LIBRARY_DIR}/${LIB}
${CMAKE_CURRENT_BINARY_DIR}/${LIB})
IF (NOT WIN32)
EXECUTE_PROCESS(COMMAND ${CMAKE_COMMAND} -E create_symlink
${MESA_LIBRARY_DIR}/${LIB}
${CMAKE_CURRENT_BINARY_DIR}/${LIB})
ELSE (NOT WIN32)
FILE(COPY ${MESA_LIBRARY_DIR}/${LIB}
DESTINATION ${CMAKE_CURRENT_BINARY_DIR})
ENDIF (NOT WIN32)
ENDFOREACH(LIB in ${MESA_LIB})
EXECUTE_PROCESS(COMMAND ${CMAKE_COMMAND} -E create_symlink
${VISIT_PYTHON_DIR}
${CMAKE_CURRENT_BINARY_DIR}/python)
IF (NOT WIN32)
EXECUTE_PROCESS(COMMAND ${CMAKE_COMMAND} -E create_symlink
${VISIT_PYTHON_DIR}
${CMAKE_CURRENT_BINARY_DIR}/python)
ELSE (NOT WIN32)
FILE(COPY ${VISIT_PYTHON_DIR}/Lib
DESTINATION ${CMAKE_CURRENT_BINARY_DIR}/python
PATTERN ".svn" EXCLUDE)
ENDIF (NOT WIN32)
IF(VISIT_PYTHON_FILTERS)
# We need to be able to locate the vtk python wrapper lib at run time.
# Place symlinks to its components in lib/site-packages/
FILE(GLOB VTK_PYTHON_MODULE_ITEMS "${VISIT_VTK_DIR}/../python${PYTHON_VERSION}/site-packages/*")
IF (NOT WIN32)
FILE(GLOB VTK_PYTHON_MODULE_ITEMS "${VISIT_VTK_DIR}/../python${PYTHON_VERSION}/site-packages/*")
ELSE (NOT WIN32)
FILE(GLOB VTK_PYTHON_MODULE_ITEMS "${VISIT_VTK_DIR}/../site-packages/*")
ENDIF (NOT WIN32)
FOREACH(ITM ${VTK_PYTHON_MODULE_ITEMS})
GET_FILENAME_COMPONENT(ITM_ABS ${ITM} ABSOLUTE)
GET_FILENAME_COMPONENT(ITM_BASE ${ITM_ABS} NAME)
EXECUTE_PROCESS(COMMAND ${CMAKE_COMMAND} -E create_symlink
${ITM_ABS}
${CMAKE_CURRENT_BINARY_DIR}/site-packages/${ITM_BASE})
IF (NOT WIN32)
EXECUTE_PROCESS(COMMAND ${CMAKE_COMMAND} -E create_symlink
${ITM_ABS}
${CMAKE_CURRENT_BINARY_DIR}/site-packages/${ITM_BASE})
ELSE (NOT WIN32)
FILE(COPY ${ITM_ABS}
DESTINATION ${CMAKE_CURRENT_BINARY_DIR}/site-packages
PATTERN ".svn" EXCLUDE)
ENDIF (NOT WIN32)
ENDFOREACH(ITM ${VTK_PYTHON_MODULE_ITEMS})
ENDIF(VISIT_PYTHON_FILTERS)
......
......@@ -271,31 +271,6 @@ public:
virtual bool Checked() const;
};
// ****************************************************************************
// Class: ToggleBoundingBoxModeAction
//
// Purpose:
// Handles the toggle bounding box mode action.
//
// Notes:
//
// Programmer: Brad Whitlock
// Creation: Wed Feb 5 16:18:22 PST 2003
//
// Modifications:
//
// ****************************************************************************
class VIEWER_API ToggleBoundingBoxModeAction : public ViewerToggleAction
{
public:
ToggleBoundingBoxModeAction(ViewerWindow *win);
virtual ~ToggleBoundingBoxModeAction(){}
virtual void Execute();
virtual bool Enabled() const;
virtual bool Checked() const;
};
// ****************************************************************************
// Class: SetWindowLayoutAction
......
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