Commit e35da851 authored by Ben Boeckel's avatar Ben Boeckel

superbuild: remove unneeded bits

The common superbuild might provide some of these things, but not all.
parent ae570d6c
.git* export-ignore
.hooks* export-ignore
*.sh crlf=input
*.sh.in crlf=input
newalpha crlf=input
newversion crlf=input
pvblot.in crlf=input
pre-commit crlf=input
*.bat whitespace=-tab-in-indent,-blank-at-eol
*.sln whitespace=-tab-in-indent,-blank-at-eol
*.vcproj whitespace=-tab-in-indent,-blank-at-eol
*.c whitespace=tab-in-indent,-blank-at-eol
*.h whitespace=tab-in-indent,-blank-at-eol
*.cxx whitespace=tab-in-indent,-blank-at-eol
*.hxx whitespace=tab-in-indent,-blank-at-eol
*.txx whitespace=tab-in-indent,-blank-at-eol
*.txt whitespace=tab-in-indent,-blank-at-eol
*.cmake whitespace=tab-in-indent,-blank-at-eol
*.c hooks.MaxObjectKiB=0
*.md whitespace=tab-in-indent conflict-marker-size=30
* VTK does not build correctly when VTK_USE_SYSTEM_HDF5 is ON and HDF5 was built
with HL enabled (which is needed for NetCDF). To solution currently is to
manually edit the CMake variable HDF5_C_LIBRARY to be
<INSTALL_DIR>/lib/libhdf5.so;<INSTALL_DIR>/lib/libhdf5_hl.so
It cannot be set in paraview.cmake file, unfortunately.
* MPICH2 does not build correctly when make -j<N> is used. Simply run a
non-parallel make.
* Need libXrender to ensure that Icons and fonts render smoothly.
* If Manta fails to build with SSE, set USE_SSE flag to OFF.
#=============================================================================
# Copyright 2009 Kitware, Inc.
#
# Distributed under the OSI-approved BSD License (the "License");
# see accompanying file Copyright.txt for details.
#
# This software is distributed WITHOUT ANY WARRANTY; without even the
# implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
# See the License for more information.
#=============================================================================
# (To distribute this file outside of CMake, substitute the full
# License text for the above reference.)
if(NOT DEFINED CMAKE_Fortran_COMPILER)
set(_desc "Looking for a Fortran compiler")
message(STATUS ${_desc})
file(REMOVE_RECURSE ${CMAKE_CURRENT_BINARY_DIR}/CMakeFiles/CheckFortran)
file(WRITE "${CMAKE_CURRENT_BINARY_DIR}/CMakeFiles/CheckFortran/CMakeLists.txt"
"cmake_minimum_required(VERSION 2.4)
project(CheckFortran Fortran)
file(WRITE \"\${CMAKE_CURRENT_BINARY_DIR}/result.cmake\"
\"set(CMAKE_Fortran_COMPILER \\\"\${CMAKE_Fortran_COMPILER}\\\")\\n\"
\"set(CMAKE_Fortran_FLAGS \\\"\${CMAKE_Fortran_FLAGS}\\\")\\n\"
)
")
execute_process(
WORKING_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}/CMakeFiles/CheckFortran
COMMAND ${CMAKE_COMMAND} . -G ${CMAKE_GENERATOR}
OUTPUT_VARIABLE output
ERROR_VARIABLE output
RESULT_VARIABLE result
)
include(${CMAKE_CURRENT_BINARY_DIR}/CMakeFiles/CheckFortran/result.cmake OPTIONAL)
if(CMAKE_Fortran_COMPILER AND "${result}" STREQUAL "0")
file(APPEND ${CMAKE_BINARY_DIR}${CMAKE_FILES_DIRECTORY}/CMakeOutput.log
"${_desc} passed with the following output:\n"
"${output}\n")
else()
set(CMAKE_Fortran_COMPILER NOTFOUND)
file(APPEND ${CMAKE_BINARY_DIR}${CMAKE_FILES_DIRECTORY}/CMakeError.log
"${_desc} failed with the following output:\n"
"${output}\n")
endif()
message(STATUS "${_desc} - ${CMAKE_Fortran_COMPILER}")
set(CMAKE_Fortran_COMPILER "${CMAKE_Fortran_COMPILER}" CACHE FILEPATH "Fortran compiler")
mark_as_advanced(CMAKE_Fortran_COMPILER)
set(CMAKE_Fortran_FLAGS "${CMAKE_Fortran_FLAGS}" CACHE STRING "Fortran flags")
mark_as_advanced(CMAKE_Fortran_FLAGS)
endif()
# This needs to set a the following variables which are using in various
# bundling codes to determine ParaView version.
# pv_version_major
# pv_version_minor
# pv_version_patch
# pv_version_suffix
# pv_version
# pv_version_long
set (hardcoded_paraview_version "4.4.0-RC1")
function(_set_version_vars versiontext)
string(REGEX MATCH "([0-9]+)\\.([0-9]+)\\.([0-9]+)[-]*(.*)" version_matches "${versiontext}")
if(CMAKE_MATCH_0)
set(full ${CMAKE_MATCH_0})
set(major ${CMAKE_MATCH_1})
set(minor ${CMAKE_MATCH_2})
set(patch ${CMAKE_MATCH_3})
set(patch_extra ${CMAKE_MATCH_4})
set(pv_version "${major}.${minor}" PARENT_SCOPE)
set(pv_version_major ${major} PARENT_SCOPE)
set(pv_version_minor ${minor} PARENT_SCOPE)
set(pv_version_patch ${patch} PARENT_SCOPE)
set(pv_version_suffix ${patch_extra} PARENT_SCOPE)
set(pv_version_long ${full} PARENT_SCOPE)
endif()
endfunction()
if(ParaView_FROM_SOURCE_DIR)
# We can use GitDescribe in this case, so let's use it.
# First, set the vars using the hard coded version if everything fails.
_set_version_vars(${hardcoded_paraview_version})
include("${PARAVIEW_SOURCE_DIR}/Utilities/Git/Git.cmake" OPTIONAL)
include("${PARAVIEW_SOURCE_DIR}/CMake/ParaViewDetermineVersion.cmake" OPTIONAL
RESULT_VARIABLE status)
if (status)
message(STATUS "Using git-describe to determine ParaView version")
# the ParaView module was correctly imported.
determine_version("${PARAVIEW_SOURCE_DIR}" "${GIT_EXECUTABLE}" "__TMP")
if (__TMP_VERSION_FULL)
_set_version_vars(${__TMP_VERSION_FULL})
endif()
endif()
# make the ParaView_VERSION variable internal to avoid confusion.
set (PARAVIEW_VERSION "${hardcoded_paraview_version}" CACHE INTERNAL "")
else()
# The user has to specify the version to use.
set(PARAVIEW_VERSION "${hardcoded_paraview_version}" CACHE STRING
"Specify the version number for the package being generated e.g. ${hardcoded_paraview_version}")
mark_as_advanced(PARAVIEW_VERSION)
_set_version_vars(${PARAVIEW_VERSION})
endif()
message(STATUS "Using ParaView Version: ${pv_version_long} (${pv_version_major}|${pv_version_minor}|${pv_version_patch}|${pv_version_suffix})")
#==========================================================================
#
# Program: ParaViewSuperBuild
#
# Copyright (c) 2005-2008 Sandia Corporation, Kitware Inc.
# All rights reserved.
#
# ParaView is a free software; you can redistribute it and/or modify it
# under the terms of the ParaView license version 1.2.
#
# See License_v1.2.txt for the full ParaView license.
# A copy of this license can be obtained by contacting
# Kitware Inc.
# 28 Corporate Drive
# Clifton Park, NY 12065
# USA
#
# THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
# ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
# LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
# A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE AUTHORS OR
# CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL,
# EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
# PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR
# PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF
# LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING
# NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
# SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
#
#==========================================================================
#
# This script tests the ParaViewSuperBuild install tree by building Examples
#
# The script expects the following input variables:
# PARAVIEW_BINARY_DIR : Build path for ParaViewSuperBuild
# (To run 'make install' here)
# PARAVIEW_INSTALL_DIR : Install path for ParaViewSuperBuild Examples are
# built against (This should be the CMAKE_INSTALL_PREFIX
# set for ParaViewSuperBuild)
# PARAVIEW_SOURCE_DIR : Source path for ParaViewSuperBuild (For source location
# of Examples)
# PARAVIEW_TEST_DIR : Temporary directory for build location of Examples
# PARAVIEW_VERSION : ParaView version string used for creating the
# ParaViewSuperBuild install tree
message (STATUS "Building Examples against ParaViewSuperbuild install tree")
set (ParaView_DIR
${PARAVIEW_INSTALL_DIR}/lib/cmake/paraview-${PARAVIEW_VERSION})
# Build target "INSTALL" for paraview
if (MSVC)
set (install_tgt "INSTALL")
set (opt "/maxcpucount")
else ()
set (install_tgt "install")
set (opt "-j"5)
endif ()
execute_process (COMMAND ${CMAKE_COMMAND}
--build ${PARAVIEW_BINARY_DIR}
--target ${install_tgt}
-- ${opt}
WORKING_DIRECTORY ${PARAVIEW_BINARY_DIR}
RESULT_VARIABLE irv)
if (NOT irv EQUAL 0)
message(FATAL_ERROR "Could not build target 'install' for ParaView")
endif ()
set (INSTALL_TEST_BUILD_DIR ${PARAVIEW_TEST_DIR}/Examples-bld)
if (NOT EXISTS ${INSTALL_TEST_BUILD_DIR})
execute_process(COMMAND ${CMAKE_COMMAND} -E
make_directory ${INSTALL_TEST_BUILD_DIR})
endif ()
execute_process (
COMMAND ${CMAKE_COMMAND}
-DParaView_DIR:PATH=${PARAVIEW_INSTALL_DIR}/lib/cmake/paraview-${PARAVIEW_VERSION}
${PARAVIEW_SOURCE_DIR}/Examples
WORKING_DIRECTORY ${INSTALL_TEST_BUILD_DIR}
RESULT_VARIABLE crv)
if (NOT crv EQUAL 0)
message(FATAL_ERROR "Configuration failed with return code ${crv}")
endif ()
execute_process (
COMMAND ${CMAKE_COMMAND} --build ${INSTALL_TEST_BUILD_DIR} --clean-first
WORKING_DIRECTORY ${INSTALL_TEST_BUILD_DIR}
RESULT_VARIABLE rv)
if (NOT rv EQUAL 0)
message(FATAL_ERROR "Build failed with return code ${rv}")
endif ()
# General build settings
set(CMAKE_BUILD_TYPE Release CACHE STRING "")
set(BUILD_SHARED_LIBS ON CACHE BOOL "")
set(ENABLE_boost ON CACHE BOOL "")
set(ENABLE_bzip2 ON CACHE BOOL "")
set(ENABLE_ffmpeg ON CACHE BOOL "")
set(ENABLE_freetype ON CACHE BOOL "")
#set(ENABLE_hdf5 ON CACHE BOOL "")
#set(ENABLE_netcdf ON CACHE BOOL "")
set(ENABLE_lapack ON CACHE BOOL "")
set(ENABLE_libxml2 ON CACHE BOOL "")
set(ENABLE_matplotlib ON CACHE BOOL "")
set(ENABLE_mpi ON CACHE BOOL "")
set(ENABLE_numpy ON CACHE BOOL "")
set(ENABLE_osmesa ON CACHE BOOL "")
set(ENABLE_paraview ON CACHE BOOL "")
set(ENABLE_paraviewsdk ON CACHE BOOL "")
set(ENABLE_png ON CACHE BOOL "")
set(ENABLE_python ON CACHE BOOL "")
#set(ENABLE_silo ON CACHE BOOL "")
set(ENABLE_visitbridge ON CACHE BOOL "")
set(ENABLE_zlib ON CACHE BOOL "")
set(USE_SYSTEM_bzip2 ON CACHE BOOL "")
set(USE_SYSTEM_freetype ON CACHE BOOL "")
set(USE_SYSTEM_hdf5 ON CACHE BOOL "")
set(USE_SYSTEM_lapack ON CACHE BOOL "")
set(USE_SYSTEM_libxml2 ON CACHE BOOL "")
set(USE_SYSTEM_matplotlib ON CACHE BOOL "")
set(USE_SYSTEM_mpi ON CACHE BOOL "")
#set(USE_SYSTEM_netcdf ON CACHE BOOL "")
set(USE_SYSTEM_numpy ON CACHE BOOL "")
set(USE_SYSTEM_osmesa ON CACHE BOOL "")
set(USE_SYSTEM_png ON CACHE BOOL "")
set(USE_SYSTEM_python ON CACHE BOOL "")
set(USE_SYSTEM_zlib ON CACHE BOOL "")
# Make sure the final ParaView build uses the whole node
include(ProcessorCount)
ProcessorCount(N)
if(NOT N EQUAL 0)
set(PV_MAKE_NCPUS ${N} CACHE STRING "")
else()
set(PV_MAKE_NCPUS 5 CACHE STRING "")
endif()
# Specify where the necessary tarballs have beel downloaded to
set(download_location $ENV{HOME}/Code/ParaView/Superbuild/downloads
CACHE PATH "")
# Paraview details
set(ParaView_FROM_GIT OFF CACHE BOOL "")
# Tarballs needing to be downloaded:
# boost
# matplotlib
# numpy
# osmesa
# paraview
# python
# visitbridge
set(CMAKE_BUILD_TYPE Release CACHE STRING "")
if("$ENV{CRAYPE_LINK_TYPE}" STREQUAL "dynamic")
set(BUILD_SHARED_LIBS ON CACHE BOOL "")
set(LIB_EXT ".so")
else()
set(BUILD_SHARED_LIBS OFF CACHE BOOL "")
set(LIB_EXT ".a")
endif()
set(ENABLE_boost ON CACHE BOOL "")
set(ENABLE_bzip2 ON CACHE BOOL "")
set(ENABLE_freetype ON CACHE BOOL "")
set(ENABLE_hdf5 ON CACHE BOOL "")
set(ENABLE_lapack ON CACHE BOOL "")
set(ENABLE_libxml2 ON CACHE BOOL "")
set(ENABLE_matplotlib ON CACHE BOOL "")
set(ENABLE_mpi ON CACHE BOOL "")
set(ENABLE_numpy ON CACHE BOOL "")
set(ENABLE_osmesa ON CACHE BOOL "")
set(ENABLE_paraview ON CACHE BOOL "")
set(ENABLE_paraviewsdk ON CACHE BOOL "")
set(ENABLE_png ON CACHE BOOL "")
set(ENABLE_python ON CACHE BOOL "")
set(ENABLE_visitbridge ON CACHE BOOL "")
set(ENABLE_zlib ON CACHE BOOL "")
# These will get pulled from the compute node's userland
set(USE_SYSTEM_bzip2 ON CACHE BOOL "")
set(USE_SYSTEM_freetype ON CACHE BOOL "")
set(USE_SYSTEM_libxml2 ON CACHE BOOL "")
set(USE_SYSTEM_png ON CACHE BOOL "")
set(USE_SYSTEM_zlib ON CACHE BOOL "")
# This comes form the cray-hdf5 module
set(USE_SYSTEM_hdf5 ON CACHE BOOL "")
# This comes from the cray-libsci module
string(TOLOWER "$ENV{PE_ENV}" PE_low)
set(USE_SYSTEM_lapack ON CACHE BOOL "")
set(BLAS_LIBRARIES
"$ENV{CRAY_LIBSCI_PREFIX_DIR}/lib/libsci_${PE_low}${LIB_EXT}"
CACHE FILEPATH "")
set(LAPACK_LIBRARIES
"$ENV{CRAY_LIBSCI_PREFIX_DIR}/lib/libsci_${PE_low}${LIB_EXT}"
CACHE FILEPATH "")
# This comes from the cray-mpich module
set(USE_SYSTEM_mpi ON CACHE BOOL "")
find_program(MPIEXEC aprun)
# Make sure the final ParaView build uses the whole node
include(ProcessorCount)
ProcessorCount(N)
if(NOT N EQUAL 0)
set(PV_MAKE_NCPUS ${N} CACHE STRING "")
else()
set(PV_MAKE_NCPUS 5 CACHE STRING "")
endif()
# Download location
set(download_location /usr/projects/packages/hpc_paraview/superbuild/downloads
CACHE STRING "")
set(ParaView_FROM_GIT OFF CACHE BOOL "")
# Tarballs needing to be downloaded:
# boost
# ffmpeg
# matplotlib
# numpy
# osmesa
# paraview
# python
# visitbridge
# General build settings
set(CMAKE_BUILD_TYPE Release CACHE STRING "")
set(BUILD_SHARED_LIBS ON CACHE BOOL "")
# Enable the appropriate packages
set(ENABLE_boost ON CACHE BOOL "")
set(ENABLE_bzip2 ON CACHE BOOL "")
set(ENABLE_ffmpeg ON CACHE BOOL "")
set(ENABLE_freetype ON CACHE BOOL "")
set(ENABLE_lapack ON CACHE BOOL "")
set(ENABLE_libxml2 ON CACHE BOOL "")
set(ENABLE_matplotlib ON CACHE BOOL "")
set(ENABLE_mpi ON CACHE BOOL "")
set(ENABLE_numpy ON CACHE BOOL "")
set(ENABLE_osmesa ON CACHE BOOL "")
set(ENABLE_paraview ON CACHE BOOL "")
set(ENABLE_paraviewsdk ON CACHE BOOL "")
set(ENABLE_png ON CACHE BOOL "")
set(ENABLE_python ON CACHE BOOL "")
set(ENABLE_visitbridge ON CACHE BOOL "")
set(ENABLE_zlib ON CACHE BOOL "")
# These will get pulled from the compute node's userland
set(USE_SYSTEM_freetype ON CACHE BOOL "")
set(USE_SYSTEM_libxml2 ON CACHE BOOL "")
set(USE_SYSTEM_png ON CACHE BOOL "")
set(USE_SYSTEM_zlib ON CACHE BOOL "")
set(USE_SYSTEM_lapack ON CACHE BOOL "")
set(USE_SYSTEM_mpi ON CACHE BOOL "")
# Make sure the final ParaView build uses the whole node
include(ProcessorCount)
ProcessorCount(N)
if(NOT N EQUAL 0)
set(PV_MAKE_NCPUS ${N} CACHE STRING "")
else()
set(PV_MAKE_NCPUS 5 CACHE STRING "")
endif()
# Specify where the necessary tarballs have beel downloaded to
set(download_location /usr/projects/packages/hpc_paraview/superbuild/downloads
CACHE PATH "")
# Paraview details
set(ParaView_FROM_GIT OFF CACHE BOOL "")
set(PARAVIEW_MODULES_TO_ENABLE "" CACHE STRING
"Specify modules to enable separated by ';' e.g. vtkIOXML;vtkFiltersProgrammable")
set(enabled_vtk_modules)
if(PARAVIEW_MODULES_TO_ENABLE)
foreach(module ${PARAVIEW_MODULES_TO_ENABLE})
set(enabled_vtk_modules
${enabled_vtk_modules}
-DModule_${module}:BOOL=ON)
endforeach()
endif()
set(64bit_build FALSE)
set(PARAVIEW_OPTIONS
-DBUILD_SHARED_LIBS:BOOL=OFF
-DBUILD_TESTING:BOOL=OFF
-DPARAVIEW_BUILD_QT_GUI:BOOL=OFF
-DVTK_USE_SYSTEM_MPI4PY:BOOL=ON
-DPARAVIEW_USE_VISITBRIDGE:BOOL=OFF
-DPARAVIEW_USE_MPI:BOOL=ON
# We need to use system HDF5 which is MPI enabled (with system zlib). Hence we
# 1. extend HDF5_C_INLCUDE_DIR to include the MPI include dirs.
# 2. Use system zlib
-DVTK_USE_SYSTEM_HDF5:BOOL=ON
-DVTK_USE_SYSTEM_ZLIB:BOOL=ON
# check is this is passed on to the ParaView CMake correctly. In my build the
# separators were misssing!!!
-DHDF5_C_INCLUDE_DIR:PATH=/opt/share/hdf5/1.8.9/bgp-gcc/include${ep_list_separator}/bgsys/drivers/V1R4M2_200_2010-100508P/ppc/comm/default/include${ep_list_separator}/bgsys/drivers/V1R4M2_200_2010-100508P/ppc/comm/sys/include
-DHDF5_hdf5_LIBRARY:FILEPATH=/opt/share/hdf5/1.8.9/bgp-gcc/lib/libhdf5.a
-DHDF5_hdf5_hl_LIBRARY:FILEPATH=/opt/share/hdf5/1.8.9/bgp-gcc/lib/libhdf5_hl.a
-DHDF5_hdf5_hl_LIBRARY_DEBUG:FILEPATH=/opt/share/hdf5/1.8.9/bgp-gcc/lib/libhdf5_hl.a
-DHDF5_hdf5_hl_LIBRARY_RELEASE:FILEPATH=/opt/share/hdf5/1.8.9/bgp-gcc/lib/libhdf5_hl.a
-DZLIB_INCLUDE_DIR:PATH=/opt/share/zlib/1.2.5/bgp-gcc/include
-DZLIB_LIBRARY:FILEPATH=/opt/share/zlib/1.2.5/bgp-gcc/lib/libz.a
# Disable MPI interrogation
-DMPI_C_NO_INTERROGATE:STRING=${CMAKE_C_COMPILER}
-DMPI_CXX_NO_INTERROGATE:STRING=${CMAKE_CXX_COMPILER}
-DMPI_Fortran_NO_INTERROGATE:STRING=${CMAKE_Fortran_COMPILER}
# Disable plugins.
-DPARAVIEW_BUILD_PLUGIN_AdiosReader:BOOL=OFF
-DPARAVIEW_BUILD_PLUGIN_AnalyzeNIfTIIO:BOOL=OFF
-DPARAVIEW_BUILD_PLUGIN_ArrowGlyph:BOOL=OFF
-DPARAVIEW_BUILD_PLUGIN_CoProcessingScriptGenerator:BOOL=OFF
-DPARAVIEW_BUILD_PLUGIN_EyeDomeLighting:BOOL=OFF
-DPARAVIEW_BUILD_PLUGIN_ForceTime:BOOL=OFF
-DPARAVIEW_BUILD_PLUGIN_GMVReader:BOOL=OFF
-DPARAVIEW_BUILD_PLUGIN_H5PartReader:BOOL=OFF
-DPARAVIEW_BUILD_PLUGIN_MantaView:BOOL=OFF
-DPARAVIEW_BUILD_PLUGIN_Moments:BOOL=OFF
-DPARAVIEW_BUILD_PLUGIN_Nektar:BOOL=OFF
-DPARAVIEW_BUILD_PLUGIN_NonOrthogonalSource:BOOL=OFF
-DPARAVIEW_BUILD_PLUGIN_PacMan:BOOL=OFF
-DPARAVIEW_BUILD_PLUGIN_PointSprite:BOOL=OFF
-DPARAVIEW_BUILD_PLUGIN_PrismPlugin:BOOL=OFF
-DPARAVIEW_BUILD_PLUGIN_QuadView:BOOL=OFF
-DPARAVIEW_BUILD_PLUGIN_SLACTools:BOOL=OFF
-DPARAVIEW_BUILD_PLUGIN_SciberQuestToolKit:BOOL=OFF
-DPARAVIEW_BUILD_PLUGIN_SierraPlotTools:BOOL=OFF
-DPARAVIEW_BUILD_PLUGIN_SurfaceLIC:BOOL=OFF
-DPARAVIEW_BUILD_PLUGIN_UncertaintyRendering:BOOL=OFF
-DPARAVIEW_BUILD_PLUGIN_VaporPlugin:BOOL=OFF
-DPARAVIEW_BUILD_PLUGIN_pvblot:BOOL=OFF
-DPARAVIEW_BUILD_PLUGIN_StreamingParticles:BOOL=OFF
# Disable automatic enabling of VTK modules. We manually select VTK modules
# that need to be enabled.
-DPARAVIEW_ENABLE_VTK_MODULES_AS_NEEDED:BOOL=OFF
${enabled_vtk_modules}
)
This diff is collapsed.
diff -ur newbuild/source/python/Python-2.7.3/Include/pymath.h newbuild/source/python/Python-2.7.3-cmakeified/Include/pymath.h
--- newbuild/source/python/Python-2.7.3/Include/pymath.h 2012-04-09 23:07:29.000000000 +0000
+++ newbuild/source/python/Python-2.7.3-cmakeified/Include/pymath.h 2012-12-07 20:56:28.015959401 +0000
@@ -14,10 +14,12 @@
*
*Note: PC/pyconfig.h defines copysign as _copysign
*/
+#define HAVE_COPYSIGN
#ifndef HAVE_COPYSIGN
extern double copysign(double, double);
#endif
+#define HAVE_ROUND
#ifndef HAVE_ROUND
extern double round(double);
#endif
diff -ur newbuild/source/python/Python-2.7.3/Modules/posixmodule.c newbuild/source/python/Python-2.7.3-cmakeified/Modules/posixmodule.c
--- newbuild/source/python/Python-2.7.3/Modules/posixmodule.c 2012-04-09 23:07:34.000000000 +0000
+++ newbuild/source/python/Python-2.7.3-cmakeified/Modules/posixmodule.c 2012-12-10 15:52:01.535879025 +0000
@@ -3716,6 +3716,8 @@
#define DEV_PTY_FILE "/dev/ptmx"
#endif
+#undef HAVE_FORKPTY
+#undef HAVE_OPENPTY
#if defined(HAVE_OPENPTY) || defined(HAVE_FORKPTY) || defined(HAVE_DEV_PTMX)
#ifdef HAVE_PTY_H
#include <pty.h>
# the name of the target operating system
set(CMAKE_SYSTEM_NAME BlueGeneP-static)
# Set search paths to prefer local, admin-installed wrappers for the BG backend compilers
set(BGP_GNU_COMPILER_SEARCH_PATHS /bgsys/drivers/ppcfloor/comm/bin/)
# GNU C Compilers
find_program(CMAKE_C_COMPILER mpicc ${BGP_GNU_COMPILER_SEARCH_PATHS})
find_program(CMAKE_CXX_COMPILER mpicxx ${BGP_GNU_COMPILER_SEARCH_PATHS})
find_program(CMAKE_Fortran_COMPILER mpif90 ${BGP_GNU_COMPILER_SEARCH_PATHS})
# Configuration for building only libOSMesa on BlueGene using the IBM xlc compiler
# This doesn't really have a lot of dependencies, so it should be usable
# on similar systems too.
# It uses static linking and disables multithreading.
include $(TOP)/configs/default
CONFIG_NAME = bluegene-osmesa
# Compiler and flags
CC = powerpc-bgp-linux-gcc
CXX = powerpc-bgp-linux-g++
CFLAGS = -O2 -pedantic -D_POSIX_SOURCE -D_POSIX_C_SOURCE=199309L -D_SVID_SOURCE -D_BSD_SOURCE
CXXFLAGS = -O2 -pedantic -D_POSIX_SOURCE -D_POSIX_C_SOURCE=199309L -D_SVID_SOURCE -D_BSD_SOURCE
MKLIB_OPTIONS = -static
OSMESA_LIB_NAME = libOSMesa.a
GLU_LIB_NAME = libGLU.a
# Directories
SRC_DIRS = mesa glu
DRIVER_DIRS = osmesa
PROGRAM_DIRS = osdemos
# Dependencies
OSMESA_LIB_DEPS = -lm
GLU_LIB_DEPS = -L$(TOP)/$(LIB_DIR) -l$(OSMESA_LIB)
APP_LIB_DEPS = -lOSMesa -lGLU -lm
diff --git a/CMake/vtkClientServerWrapping.cmake b/CMake/vtkClientServerWrapping.cmake
index 7173d12..2096dc7 100644
--- a/CMake/vtkClientServerWrapping.cmake
+++ b/CMake/vtkClientServerWrapping.cmake
@@ -23,7 +23,8 @@ macro(vtk_add_cs_wrapping module)
PROPERTY INCLUDE_DIRECTORIES
${${module}_DEPENDS_INCLUDE_DIRS}
${${module}_INCLUDE_DIRS}
- ${vtkClientServer_INCLUDE_DIRS})
+ ${vtkClientServer_INCLUDE_DIRS}
+ ${OPENGL_INCLUDE_DIR})
# add compile definition for auto init for modules that provide implementation
if(${module}_IMPLEMENTS)
diff --git a/ParaViewCore/ClientServerCore/Core/vtkPVSystemConfigInformation.h b/ParaViewCore/ClientServerCore/Core/vtkPVSystemConfigInformation.h
index 8b36d91..76ec673 100644
--- a/ParaViewCore/ClientServerCore/Core/vtkPVSystemConfigInformation.h
+++ b/ParaViewCore/ClientServerCore/Core/vtkPVSystemConfigInformation.h
@@ -74,7 +74,7 @@ protected:
vtkPVSystemConfigInformation();
~vtkPVSystemConfigInformation();
-private:
+public:
//BTX
class ConfigInfo
{
diff --git a/ParaViewCore/ClientServerCore/Rendering/CMakeLists.txt b/ParaViewCore/ClientServerCore/Rendering/CMakeLists.txt
index 77b2b05..c0adf17 100644
--- a/ParaViewCore/ClientServerCore/Rendering/CMakeLists.txt
+++ b/ParaViewCore/ClientServerCore/Rendering/CMakeLists.txt
@@ -111,6 +111,9 @@ set_source_files_properties(
vtkPVView
ABSTRACT)
+
+include_directories(${OPENGL_INCLUDE_DIR})
+
# until VTK comes up with a cleaner mechanism, we set the hints like so.
set (old_VTK_WRAP_HINTS ${VTK_WRAP_HINTS})
set (VTK_WRAP_HINTS ${CMAKE_CURRENT_SOURCE_DIR}/hints)
diff --git a/ParaViewCore/VTKExtensions/Default/CMakeLists.txt b/ParaViewCore/VTKExtensions/Default/CMakeLists.txt
index ad45c23..762cf1b 100644
--- a/ParaViewCore/VTKExtensions/Default/CMakeLists.txt
+++ b/ParaViewCore/VTKExtensions/Default/CMakeLists.txt
@@ -169,6 +169,9 @@ set_source_files_properties(
vtkTransferFunctionEditorWidget1D
ABSTRACT)
+
+include_directories(${OPENGL_INCLUDE_DIR})
+
# until VTK comes up with a cleaner mechanism, we set the hints like so.
set (old_VTK_WRAP_HINTS ${VTK_WRAP_HINTS})
set (VTK_WRAP_HINTS ${CMAKE_CURRENT_SOURCE_DIR}/hints)
diff --git a/ParaViewCore/VTKExtensions/Rendering/CMakeLists.txt b/ParaViewCore/VTKExtensions/Rendering/CMakeLists.txt
index 31934aa..66adae4 100644
--- a/ParaViewCore/VTKExtensions/Rendering/CMakeLists.txt
+++ b/ParaViewCore/VTKExtensions/Rendering/CMakeLists.txt
@@ -137,4 +137,7 @@ foreach (file vtkIceTCompositeZPassShader_fs.glsl)
endforeach()
#---------------------------------------------------------
+
+include_directories(${OPENGL_INCLUDE_DIR})
+
vtk_module_library(vtkPVVTKExtensionsRendering ${Module_SRCS})
diff --git a/ParaViewCore/VTKExtensions/Rendering/vtkSortedTableStreamer.cxx b/ParaViewCore/VTKExtensions/Rendering/vtkSortedTableStreamer.cxx
index 4c2f230..3e5a973 100644
--- a/ParaViewCore/VTKExtensions/Rendering/vtkSortedTableStreamer.cxx
+++ b/ParaViewCore/VTKExtensions/Rendering/vtkSortedTableStreamer.cxx
@@ -157,7 +157,7 @@ public:
};
//----------------------------------------------------------------------------
template<class T>
-class vtkSortedTableStreamer::Internals : public InternalsBase
+class vtkSortedTableStreamer::Internals : public vtkSortedTableStreamer::InternalsBase
{
public:
class Histogram
diff --git a/Utilities/WrapClientServer/vtkWrapClientServer.c b/Utilities/WrapClientServer/vtkWrapClientServer.c
index 1ea05dc..dc52f16 100644
--- a/Utilities/WrapClientServer/vtkWrapClientServer.c
+++ b/Utilities/WrapClientServer/vtkWrapClientServer.c
@@ -1114,8 +1114,8 @@ int main(int argc, char *argv[])
fprintf(fp,"#define VTK_WRAPPING_CXX\n");
if(strcmp("vtkObjectBase", data->Name) != 0)
{
- /* Block inclusion of full streams. */
- fprintf(fp,"#define VTK_STREAMS_FWD_ONLY\n");
+ ///* Block inclusion of full streams. */
+ //fprintf(fp,"#define VTK_STREAMS_FWD_ONLY\n");
}
fprintf(fp,"#include \"vtkSystemIncludes.h\"\n");
fprintf(fp,"#include \"%s.h\"\n",data->Name);
set(64bit_build TRUE)
set(PARAVIEW_OPTIONS "")
list(APPEND PARAVIEW_OPTIONS "-DBUILD_SHARED_LIBS:BOOL=OFF")
list(APPEND PARAVIEW_OPTIONS "-DBUILD_TESTING:BOOL=OFF")
list(APPEND PARAVIEW_OPTIONS "-DPARAVIEW_BUILD_QT_GUI:BOOL=OFF")
#
list(APPEND PARAVIEW_OPTIONS "-DENABLE_MPI4PY:BOOL=OFF")
list(APPEND PARAVIEW_OPTIONS "-DVTK_USE_SYSTEM_MPI4PY:BOOL=ON")
#
list(APPEND PARAVIEW_OPTIONS "-DPARAVIEW_USE_MPI:BOOL=ON")
#
list(APPEND PARAVIEW_OPTIONS "-DVTK_USE_SYSTEM_HDF5:BOOL=1")
list(APPEND PARAVIEW_OPTIONS "-DHDF5_FOUND:BOOL=1")
list(APPEND PARAVIEW_OPTIONS "-DHDF5_LIBRARIES:STRING=/soft/apps/current/hdf5-1.8.9/lib/libhdf5.a${ep_list_separator}