Commit 464a5f05 authored by bonnell's avatar bonnell
Browse files

update conduit version on my machine.

git-svn-id: http://visit.ilight.com/svn/visit/trunk/src@31482 18c085ea-50e0-402c-830e-de6fd14e8384
parent 7a1e751c
...@@ -2,16 +2,15 @@ ...@@ -2,16 +2,15 @@
## Setup VISITHOME variables. ## Setup VISITHOME variables.
## ##
SET(VISITHOME /home/biagas2/visit/thirdparty/2.13.0) SET(VISITHOME /home/biagas2/visit/thirdparty/2.13.0)
#SET(VISITARCH linux-x86_64_gcc-4.4)
SET(VISITARCH linux-x86_64_gcc-6.2) SET(VISITARCH linux-x86_64_gcc-6.2)
## Compiler flags. ## Compiler flags.
## ##
VISIT_OPTION_DEFAULT(VISIT_C_COMPILER gcc TYPE FILEPATH) VISIT_OPTION_DEFAULT(VISIT_C_COMPILER /opt/rh/devtoolset-6/root/usr/bin/gcc TYPE FILEPATH)
VISIT_OPTION_DEFAULT(VISIT_CXX_COMPILER g++ TYPE FILEPATH) VISIT_OPTION_DEFAULT(VISIT_CXX_COMPILER /opt/rh/devtoolset-6/root/usr/bin/g++ TYPE FILEPATH)
VISIT_OPTION_DEFAULT(VISIT_FORTRAN_COMPILER no TYPE FILEPATH) VISIT_OPTION_DEFAULT(VISIT_FORTRAN_COMPILER no TYPE FILEPATH)
VISIT_OPTION_DEFAULT(VISIT_C_FLAGS " -m64 -fPIC -O2 -fvisibility=hidden" TYPE STRING) VISIT_OPTION_DEFAULT(VISIT_C_FLAGS " -m64 -fPIC -fvisibility=hidden" TYPE STRING)
VISIT_OPTION_DEFAULT(VISIT_CXX_FLAGS " -m64 -fPIC -O2 -fvisibility=hidden" TYPE STRING) VISIT_OPTION_DEFAULT(VISIT_CXX_FLAGS " -m64 -fPIC -fvisibility=hidden" TYPE STRING)
## ##
## Parallel Build Setup. ## Parallel Build Setup.
...@@ -127,7 +126,7 @@ VISIT_OPTION_DEFAULT(VISIT_CGNS_LIBDEP HDF5_LIBRARY_DIR hdf5 ${VISIT_HDF5_LIBDEP ...@@ -127,7 +126,7 @@ VISIT_OPTION_DEFAULT(VISIT_CGNS_LIBDEP HDF5_LIBRARY_DIR hdf5 ${VISIT_HDF5_LIBDEP
## ##
## Conduit ## Conduit
## ##
VISIT_OPTION_DEFAULT(VISIT_CONDUIT_DIR ${VISITHOME}/conduit/0.2.1/${VISITARCH}) VISIT_OPTION_DEFAULT(VISIT_CONDUIT_DIR ${VISITHOME}/conduit/v0.3.0/${VISITARCH})
VISIT_OPTION_DEFAULT(VISIT_CONDUIT_LIBDEP HDF5_LIBRARY_DIR hdf5 ${VISIT_HDF5_LIBDEP} TYPE STRING) VISIT_OPTION_DEFAULT(VISIT_CONDUIT_LIBDEP HDF5_LIBRARY_DIR hdf5 ${VISIT_HDF5_LIBDEP} TYPE STRING)
## ##
......
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