Commit 16f6853e authored by miller86's avatar miller86

enabling boost interval library

git-svn-id: http://visit.ilight.com/svn/visit/trunk/src@10092 18c085ea-50e0-402c-830e-de6fd14e8384
parent a6f00461
......@@ -537,6 +537,10 @@ IF(VISIT_TUVOK)
SET(TUVOK_LIB tuvok ${QT_QTCORE_LIBRARY} ${QT_QTGUI_LIBRARY} ${QT_QTOPENGL_LIBRARY} GLEW)
ENDIF(VISIT_TUVOK)
# Set up boost (interval) library
SET(HAVE_BILIB 1)
SET(BOOST_INCLUDE_DIR ${VISIT_SOURCE_DIR}/third_party_builtin/bilib/boost/interval)
# Set up the SLIVR library if it was enabled.
IF(VISIT_SLIVR)
SET(SLIVR_INCLUDE_DIR
......
......@@ -176,6 +176,9 @@ using std::map;
// Jeremy Meredith, Tue Aug 4 10:48:26 EDT 2009
// Added comment for Youngs algorithm.
//
// Mark C. Miller, Wed Mar 3 07:59:15 PST 2010
// Changed form of conditional compilation check for HAVE_BILIB from
// numeric test to existence test.
// ****************************************************************************
avtDataRequest::avtDataRequest(const char *var, int ts,
......@@ -210,7 +213,7 @@ avtDataRequest::avtDataRequest(const char *var, int ts,
needNativePrecision = false;
discTol = 0.01;
flatTol = 0.05;
#if HAVE_BILIB
#ifdef HAVE_BILIB
discMode = 1; // adaptive
#else
discMode = 0; // uniform
......@@ -1551,13 +1554,17 @@ avtDataRequest::GetAdmissibleDataTypes() const
//
// Mark C. Miller, Tue Dec 5 18:14:58 PST 2006
// Made it more robust if FI library not available.
//
// Mark C. Miller, Wed Mar 3 07:59:15 PST 2010
// Changed form of conditional compilation check for HAVE_BILIB from
// numeric test to existence test.
// ****************************************************************************
void
avtDataRequest::SetDiscMode(int mode)
{
discMode = mode;
#if !HAVE_BILIB
#ifndef HAVE_BILIB
if (discMode == 1) // Adaptive
{
debug1 << "Adaptive not available. "
......
......@@ -142,6 +142,9 @@ QvisMeshManagementWindow::~QvisMeshManagementWindow()
// Jeremy Meredith, Fri Feb 26 14:13:08 EST 2010
// Added a new "multi-pass" discretization algorithm
//
// Mark C. Miller, Wed Mar 3 07:59:15 PST 2010
// Changed form of conditional compilation check for HAVE_BILIB from
// numeric test to existence test.
// ****************************************************************************
void
......@@ -186,7 +189,7 @@ QvisMeshManagementWindow::CreateWindowContents()
layoutCSGGroup->addWidget(discretizeUniform, 2, 1);
discretizeAdaptive = new QRadioButton(tr("Adaptive"), pageCSGGroup);
discretizationMode->addButton(discretizeAdaptive,1);
#if !HAVE_BILIB
#ifndef HAVE_BILIB
discretizeAdaptive->setEnabled(false);
#endif
layoutCSGGroup->addWidget(discretizeAdaptive, 2, 2);
......@@ -249,6 +252,9 @@ QvisMeshManagementWindow::CreateWindowContents()
// Jeremy Meredith, Fri Feb 26 14:13:08 EST 2010
// Added a new "multi-pass" discretization algorithm
//
// Mark C. Miller, Wed Mar 3 07:59:15 PST 2010
// Changed form of conditional compilation check for HAVE_BILIB from
// numeric test to existence test.
// ****************************************************************************
void
......@@ -295,7 +301,7 @@ QvisMeshManagementWindow::UpdateWindow(bool doAll)
}
else if (dMode == MeshManagementAttributes::Adaptive)
{
#if HAVE_BILIB
#ifdef HAVE_BILIB
discretizationMode->button(1)->setChecked(true);
flatEnoughLineEdit->setEnabled(true);
#else
......@@ -505,7 +511,7 @@ QvisMeshManagementWindow::discretizationModeChanged(int val)
mmAtts->SetDiscretizationMode(MeshManagementAttributes::Uniform);
else if (val == 1)
{
#if HAVE_BILIB
#ifdef HAVE_BILIB
mmAtts->SetDiscretizationMode(MeshManagementAttributes::Adaptive);
#else
GUIBase::Warning(tr("Adaptive not available. "
......
......@@ -42,6 +42,7 @@ PROJECT(thirdparty_builtins)
ADD_SUBDIRECTORY(glew)
ADD_SUBDIRECTORY(verdict)
ADD_SUBDIRECTORY(bilib)
IF(VISIT_PARALLEL)
ADD_SUBDIRECTORY(cognomen)
ENDIF(VISIT_PARALLEL)
......
#*****************************************************************************
#
# Copyright (c) 2000 - 2010, Lawrence Livermore National Security, LLC
# Produced at the Lawrence Livermore National Laboratory
# LLNL-CODE-400142
# All rights reserved.
#
# This file is part of VisIt. For details, see https://visit.llnl.gov/. The
# full copyright notice is contained in the file COPYRIGHT located at the root
# of the VisIt distribution or at http://www.llnl.gov/visit/copyright.html.
#
# Redistribution and use in source and binary forms, with or without
# modification, are permitted provided that the following conditions are met:
#
# - Redistributions of source code must retain the above copyright notice,
# this list of conditions and the disclaimer below.
# - Redistributions in binary form must reproduce the above copyright notice,
# this list of conditions and the disclaimer (as noted below) in the
# documentation and/or other materials provided with the distribution.
# - Neither the name of the LLNS/LLNL nor the names of its contributors may
# be used to endorse or promote products derived from this software without
# specific prior written permission.
#
# 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 LAWRENCE LIVERMORE NATIONAL SECURITY,
# LLC, THE U.S. DEPARTMENT OF ENERGY 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.
#
# Modifications:
# Eric Brugger, Fri Jan 22 16:51:39 PST 2010
# I added the data generator unic, which generates UNIC test data.
#
# Mark C. Miller, Fri Jan 22 16:40:43 PST 2010
# Added function LINK_DATA_TARGETS and invokation to create sesame.pdb.lnk
# and largefile.silo.lnk.
#
# Mark C. Miller, Fri Jan 22 17:27:47 PST 2010
# Removed preceding change to satisfy purists ;)
#
# Cyrus Harrison, Mon Feb 1 12:46:56 PST 2010
# Added missing visit includes to basic targets.
#
# Brad Whitlock, Wed Feb 10 14:44:23 PST 2010
# I added Velodyne test data.
#
#****************************************************************************/
cmake_minimum_required(VERSION 2.6)
#-----------------------------------------------------------------------------
# Discover the proper untar command.
#
# "cmake -E tar" supports untaring for normal & gzipped tarballs.
# Unfortunately it is very slow so we only use it as a fallback.
#
#-----------------------------------------------------------------------------
FIND_PROGRAM(TAR_EXE tar)
IF(NOT "${TAR_EXE}" STREQUAL "TAR_EXE-NOTFOUND")
SET(UNTAR_CMD ${TAR_EXE})
SET(UNTAR_ARGS "-xzvf")
ELSE(NOT "${TAR_EXE}" STREQUAL "TAR_EXE-NOTFOUND")
SET(UNTAR_CMD "cmake")
SET(UNTAR_ARGS "-E tar -xzvf")
ENDIF(NOT "${TAR_EXE}" STREQUAL "TAR_EXE-NOTFOUND")
#-----------------------------------------------------------------------------
# Add a custom command to extract each archived dataset & collect
# output directory names in a dependency list.
#-----------------------------------------------------------------------------
EXECUTE_PROCESS(COMMAND ${UNTAR_CMD} ${UNTAR_ARGS} ${CMAKE_CURRENT_SOURCE_DIR}/boost.tar.gz
WORKING_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}
OUTPUT_VARIABLE BOOST_FILES)
INSTALL(FILES ${BOOST_FILES}
DESTINATION ${VISIT_INSTALLED_VERSION_INCLUDE}/boost
PERMISSIONS OWNER_READ OWNER_WRITE OWNER_EXECUTE
GROUP_READ GROUP_WRITE GROUP_EXECUTE
WORLD_READ WORLD_EXECUTE)
# Copyright (c) 2000 - 2009
# Lawrence Livermore National Security, LLC
# Produced at the Lawrence Livermore National Laboratory
# LLNL-CODE-400124
# All rights reserved.
#
# This file is part of VisIt. For details, see https://visit.llnl.gov/. The
# full copyright notice is contained in the file COPYRIGHT located at the root
# of the VisIt distribution or at https://visit.llnl.gov/copyright.html.
#
# Redistribution and use in source and binary forms, with or without
# modification, are permitted provided that the following conditions are met:
#
# - Redistributions of source code must retain the above copyright notice,
# this list of conditions and the disclaimer below.
# - Redistributions in binary form must reproduce the above copyright notice,
# this list of conditions and the disclaimer (as noted below) in the
# documentation and/or other materials provided with the distribution.
# - Neither the name of the LLNS/LLNL nor the names of its contributors may be
# used to endorse or promote products derived from this software without
# specific prior written permission.
#
# 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 LAWRENCE LIVERMORE NATIONAL SECURITY,
# LLC, THE U.S. DEPARTMENT OF ENERGY 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.
#
# Modifications:
#
# Eric Brugger, Fri Jun 29 09:19:23 PDT 2007
# Removed the setting of the DISTRIB variable.
#
# Jeremy Meredith, Fri Sep 7 13:18:56 EDT 2007
# Don't remove the boost header files in make clean, just distclean.
#
# Mark C. Miller, Mon Jun 15 22:22:46 PDT 2009
# Removed LIBTARGETS line. It was not needed anyway and caused problems
# for SUSE make-3.8x.
#
# Mark C. Miler, Tue Oct 20 21:32:28 PDT 2009
# Removed '@' surrounding LIBTARGETS in comment above as that was
# resulting in real configure symbol substitution.
##############################################################################
##
## Programs and options...
##
@SET_MAKE@
@VARIABLES@
CPPFLAGS=-I. -I../../include @CPPFLAGS@ @VTK_INCLUDES@ @SILO_INCLUDE@
LIBS=
##
## Standard targets...
##
all: message bilib.installed
clean:
DISTCLEAN_FILES=-rf boost-interval bilib.installed
bilib.installed: boost-interval.tar.bz2
bunzip2 < boost-interval.tar.bz2 | tar xf -
ln -fs $(TOPDIR)/third_party_builtin/bilib/boost-interval ../../include/boost
touch bilib.installed
##
## Other targets
##
message:
@echo
@echo "****************************************************************************"
@echo "*** Installing Boost Interval Template Library"
@echo "****************************************************************************"
##
## Automatic dependency stuff
##
@TARGETS@
......@@ -99,6 +99,7 @@ ${VISIT_SOURCE_DIR}/common/Exceptions/Pipeline
${VISIT_SOURCE_DIR}/common/misc
${VISIT_SOURCE_DIR}/common/utility
${VISIT_SOURCE_DIR}/visit_vtk/lightweight
${VISIT_SOURCE_DIR}/third_party_builtin/bilib
${VTK_INCLUDE_DIRS}
)
......
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