Commit 00b532ea authored by brugger's avatar brugger
Browse files

I updated the third party libraries on cab for the trunk. As with kickit, 
this isn't the final build of the third party libraries since several more 
libraries are expected to be updated. I am using gcc 4.8.2 for doing the
builds in anticipation of needing c++11 support for VisIt 2.13.0. At the
moment it appears VisIt builds with the default gcc 4.4.7 compiler, but
I expect we will need to compile 2.13.0 with gcc 4.8.2. To do that you
will need to do a "module load gnu/4.8.2". You will also need to use the
new cab config site file to build on cab.



git-svn-id: http://visit.ilight.com/svn/visit/trunk/src@31459 18c085ea-50e0-402c-830e-de6fd14e8384
parent e8760bce
#/usr/workspace/wsa/visit/visit/thirdparty_shared/2.13.0_gcc4.8/cmake/3.8.1/linux-x86_64_gcc-4.8/bin/cmake
#/usr/workspace/wsa/visit/visit/thirdparty_shared/2.13.0/cmake/3.8.1/linux-x86_64_gcc-4.8/bin/cmake
##
## ./build_visit2_13_0 generated host.cmake
## created: Tue Aug 1 10:39:51 PDT 2017
## system: Linux cab687 2.6.32-696.3.1.1chaos.ch5.6.x86_64 #1 SMP Tue May 30 14:20:14 PDT 2017 x86_64 x86_64 x86_64 GNU/Linux
## created: Wed Sep 6 08:06:07 PDT 2017
## system: Linux cab670 2.6.32-696.3.1.1chaos.ch5.6.x86_64 #1 SMP Tue May 30 14:20:14 PDT 2017 x86_64 x86_64 x86_64 GNU/Linux
## by: brugger
##
## Setup VISITHOME & VISITARCH variables.
##
SET(VISITHOME /usr/workspace/wsa/visit/visit/thirdparty_shared/2.13.0_gcc4.8)
SET(VISITHOME /usr/workspace/wsa/visit/visit/thirdparty_shared/2.13.0)
SET(VISITARCH linux-x86_64_gcc-4.8)
VISIT_OPTION_DEFAULT(VISIT_SLIVR TRUE TYPE BOOL)
......@@ -16,6 +16,7 @@ VISIT_OPTION_DEFAULT(VISIT_SLIVR TRUE TYPE BOOL)
##
VISIT_OPTION_DEFAULT(VISIT_C_COMPILER gcc TYPE FILEPATH)
VISIT_OPTION_DEFAULT(VISIT_CXX_COMPILER g++ TYPE FILEPATH)
VISIT_OPTION_DEFAULT(VISIT_FORTRAN_COMPILER no TYPE FILEPATH)
VISIT_OPTION_DEFAULT(VISIT_C_FLAGS " -m64 -fPIC -fvisibility=hidden" TYPE STRING)
VISIT_OPTION_DEFAULT(VISIT_CXX_FLAGS " -m64 -fPIC -fvisibility=hidden" TYPE STRING)
......@@ -134,6 +135,16 @@ VISIT_OPTION_DEFAULT(VISIT_CGNS_LIBDEP HDF5_LIBRARY_DIR hdf5 ${VISIT_HDF5_LIBDEP
##
VISIT_OPTION_DEFAULT(VISIT_GDAL_DIR ${VISITHOME}/gdal/1.10.0/${VISITARCH})
##
## LLVM
##
VISIT_OPTION_DEFAULT(VISIT_LLVM_DIR ${VISITHOME}/llvm/4.0.0/${VISITARCH})
##
## OpenSWR
##
VISIT_OPTION_DEFAULT(VISIT_OPENSWR_DIR ${VISITHOME}/openswr/17.0.6/${VISITARCH})
##
## H5Part
##
......@@ -195,12 +206,6 @@ VISIT_OPTION_DEFAULT(VISIT_PYSIDE_DIR ${VISITHOME}/pyside/2.0.0-2017.02.14/${VIS
VISIT_OPTION_DEFAULT(VISIT_SILO_DIR ${VISITHOME}/silo/4.10.1/${VISITARCH})
VISIT_OPTION_DEFAULT(VISIT_SILO_LIBDEP HDF5_LIBRARY_DIR hdf5 ${VISIT_HDF5_LIBDEP} ZLIB_LIBRARY_DIR z TYPE STRING)
##
## Uintah
##
SETUP_APP_VERSION(UINTAH 2.0.0)
VISIT_OPTION_DEFAULT(VISIT_UINTAH_DIR ${VISITHOME}/uintah/${UINTAH_VERSION}/${VISITARCH})
##
## VISUS
##
......
......@@ -267,13 +267,12 @@ if test "$serial" = "true" ; then
sed -i "s/VISIT_PARALLEL ON/VISIT_PARALLEL OFF/" config-site/surface86-test.cmake
fi
if test "$branch" = "trunk" ; then
export PATH=/opt/rh/devtoolset-3/root/usr/bin:\$PATH
export GNU_INCLUDES=/opt/rh/devtoolset-3/root/usr/include/c++/4.9.2
export GNU_LIBS=/opt/rh/devtoolset-3/root/usr/lib64:/opt/rh/devtoolset-3/root/usr/lib/gcc/x86_64-redhat-linux/4.9.2
export LD_LIBRARY_PATH=\$LD_LIBRARY_PATH:/opt/rh/devtoolset-3/root/usr/lib64:/opt/rh/devtoolset-3/root/usr/lib/gcc/x86_64-redhat-linux/4.9.2
export _LMFILES_=/opt/modules/modulefiles/gnu/4.9.2
/usr/workspace/wsa/visit/visit/thirdparty_shared/2.13.0/cmake/3.0.2/linux-x86_64_gcc-4.9/bin/cmake \
-DVISIT_CONFIG_SITE=config-site/surface86-test.cmake \
export PATH=/opt/rh/devtoolset-2/root/usr/bin:\$PATH
export GNU_INCLUDES=/opt/rh/devtoolset-2/root/usr/include/c++/4.8.2
export GNU_LIBS=/opt/rh/devtoolset-2/root/usr/lib64:/opt/rh/devtoolset-2/root/usr/lib/gcc/x86_64-redhat-linux/4.8.2
export LD_LIBRARY_PATH=\$LD_LIBRARY_PATH:/opt/rh/devtoolset-2/root/usr/lib64:/opt/rh/devtoolset-2/root/usr/lib/gcc/x86_64-redhat-linux/4.8.2
export _LMFILES_=/opt/modules/modulefiles/gnu/4.8.2
/usr/workspace/wsa/visit/visit/thirdparty_shared/2.13.0/cmake/3.8.1/linux-x86_64_gcc-4.8/bin/cmake \
-DCMAKE_BUILD_TYPE=Release \
-DVISIT_BUILD_ALL_PLUGINS=1 \
-DVISIT_DATA_MANUAL_EXAMPLES:BOOL=ON \
......
......@@ -557,6 +557,11 @@ fi
rm -f cab
cat <<EOF > cab
#!/bin/sh
export PATH=/opt/rh/devtoolset-2/root/usr/bin:\$PATH
export GNU_INCLUDES=/opt/rh/devtoolset-2/root/usr/include/c++/4.8.2
export GNU_LIBS=/opt/rh/devtoolset-2/root/usr/lib64:/opt/rh/devtoolset-2/root/usr/lib/gcc/x86_64-redhat-linux/4.8.2
export LD_LIBRARY_PATH=\$LD_LIBRARY_PATH:/opt/rh/devtoolset-2/root/usr/lib64:/opt/rh/devtoolset-2/root/usr/lib/gcc/x86_64-redhat-linux/4.8.2
export _LMFILES_=/opt/modules/modulefiles/gnu/4.8.2
if test ! -d /usr/tmp/$user ; then
mkdir /usr/tmp/$user
fi
......@@ -572,7 +577,7 @@ cd $dist/src
ver=\`cat VERSION\`
ver2=\`echo \$ver | tr "." "_"\`
export PATH=\$PATH:/usr/bin/X11
/usr/gapps/visit/thirdparty_shared/2.12.0/cmake/3.0.2/linux-x86_64_gcc-4.4/bin/cmake . -DCMAKE_BUILD_TYPE:STRING=Release -DVISIT_CONFIG_SITE=config-site/surface86.cmake -DVISIT_INSTALL_THIRD_PARTY:BOOL=ON -DVISIT_PARADIS:BOOL=ON >> ../../buildlog 2>&1
/usr/workspace/wsa/visit/visit/thirdparty_shared/2.13.0/cmake/3.8.1/linux-x86_64_gcc-4.8/bin/cmake . -DCMAKE_BUILD_TYPE:STRING=Release -DVISIT_INSTALL_THIRD_PARTY:BOOL=ON -DVISIT_PARADIS:BOOL=ON >> ../../buildlog 2>&1
make -j 6 package >> ../../buildlog 2>&1
mv visit\$ver2.linux-x86_64.tar.gz ../..
cd ../..
......
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