I made several modifications for building on kickit. (#62)

I made the following changes: 1. I removed the setting of HAVE_OSMESA from FindOSMesa.cmake since it isn't necessary. I think the code enabled by HAVE_OSMESA can be removed as well. 2. I removed setting VISIT_OSMESA_DIR from the kickit config site file to allow passing it as a flag to CMake if desired. 3. I made a few minor corrections to build visit for ADIOS2. It builds the serial version successfully, but not the parallel version. 4. I modified visit-build-open for building on kickit.
visit-dav · Feb 11, 2019 · 79c817d · 79c817d
1 parent 52bcaf4
commit 79c817d
Show file tree

Hide file tree

Showing 4 changed files with 11 additions and 11 deletions.
diff --git a/src/CMake/FindOSMesa.cmake b/src/CMake/FindOSMesa.cmake
@@ -61,6 +61,13 @@
 #   Kathleen Biagas, Wed Jun 27 14:40:39 MST 2018
 #   Set OSMESA_INCLUDE_DIR OSMESA_LIBRARIES in cache.
 #
+#   Eric Brugger, Mon Feb 11 13:20:34 PST 2019
+#   Remove the setting of HAVE_OSMESA. Setting it when OSMESA is specified
+#   doesn't make sense, since VTK isn't built with mesa in this case and when
+#   VTK is built with mesa HAVE_OSMESA isn't set, the case where MESAGL is
+#   specified. I think all the code involving HAVE_OSMESA can actually be
+#   removed.
+#
 #****************************************************************************/
 
 # Use the OSMESA_DIR hint from the config-site .cmake file
@@ -71,7 +78,6 @@ if (VISIT_OSMESA_DIR)
                  NO_DEFAULT_PATH)
     if (OSMESA_LIBRARY)
         set(OSMESA_FOUND true)
-        set(HAVE_OSMESA true CACHE BOOL "Have OSMesa library")
         get_filename_component(OSMESA_LIB ${OSMESA_LIBRARY} NAME)
         execute_process(COMMAND ${CMAKE_COMMAND} -E make_directory
                       ${VISIT_BINARY_DIR}/lib/osmesa
@@ -103,7 +109,6 @@ if (VISIT_OSMESA_DIR)
 
 
     else()
-        set(HAVE_OSMESA false)
         message(STATUS "OSMesa not found, OSMESA_SIZE_LIMIT defaulting to 4096")
         set(HAVE_OSMESA_SIZE 0 CACHE INTERNAL "support for osmesa_size")
         set(OSMESA_SIZE_LIMIT 4096)

diff --git a/src/config-site/kickit.llnl.gov.cmake b/src/config-site/kickit.llnl.gov.cmake
@@ -228,11 +228,6 @@ VISIT_OPTION_DEFAULT(VISIT_NETCDF_LIBDEP HDF5_LIBRARY_DIR hdf5_hl HDF5_LIBRARY_D
 ##
 VISIT_OPTION_DEFAULT(VISIT_OPENEXR_DIR ${VISITHOME}/openexr/2.2.0/${VISITARCH})
 
-##
-## OSMesa
-##
-VISIT_OPTION_DEFAULT(VISIT_OSMESA_DIR ${VISITHOME}/osmesa/17.2.8/${VISITARCH})
-
 ##
 ## P7ZIP
 ##

diff --git a/src/tools/dev/scripts/bv_support/bv_adios2.sh b/src/tools/dev/scripts/bv_support/bv_adios2.sh
@@ -67,11 +67,11 @@ function bv_adios2_initialize_vars
 
 function bv_adios2_info
 {
-    export ADIOS2_VERSION=${ADIOS2_VERSION:-"0.1.0"}
+    export ADIOS2_VERSION=${ADIOS2_VERSION:-"2.3.0"}
     export ADIOS2_FILE=${ADIOS2_FILE:-"ADIOS2-${ADIOS2_VERSION}.tar.gz"}
     export ADIOS2_COMPATIBILITY_VERSION=${ADIOS2_COMPATIBILITY_VERSION:-"${ADIOS2_VERSION}"}
     export ADIOS2_URL=${ADIOS2_URL:-"http://users.nccs.gov/~pugmire"}
-    export ADIOS2_BUILD_DIR=${ADIOS2_BUILD_DIR:-"ADIOS2"}
+    export ADIOS2_BUILD_DIR=${ADIOS2_BUILD_DIR:-"ADIOS2-${ADIOS2_VERSION}"}
     export ADIOS2_MD5_CHECKSUM=""
     export ADIOS2_SHA256_CHECKSUM=""
 }

diff --git a/src/tools/dev/scripts/visit-build-open b/src/tools/dev/scripts/visit-build-open
@@ -385,7 +385,7 @@ gunzip -c $dist.tar.gz | tar xvf - > buildlog 2>&1
 cd $dist/src
 ver=\`cat VERSION\`
 ver2=\`echo \$ver | tr "." "_"\`
-/usr/gapps/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_ENABLE_XDB:BOOL=ON -DVISIT_PARADIS:BOOL=ON >> ../../buildlog 2>&1
+/usr/gapps/visit/thirdparty_shared/3.0.0b/cmake/3.9.3/linux-x86_64_gcc-4.8/bin/cmake . -DCMAKE_BUILD_TYPE:STRING=Release -DVISIT_INSTALL_THIRD_PARTY:BOOL=ON -DVISIT_ENABLE_XDB:BOOL=ON -DVISIT_PARADIS:BOOL=ON >> ../../buildlog 2>&1
 make -j 4 package >> ../../buildlog 2>&1
 mv visit\$ver2.linux-x86_64.tar.gz ../..
 cd ../..
@@ -404,7 +404,7 @@ ls $dist/src/plugins/databases/libI* | sed "s/$dist\/src\/plugins\/databases\/li
 rm -rf $dist
 gunzip -c $dist.tar.gz | tar xvf - >> buildlog 2>&1
 cd $dist/src
-/usr/gapps/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_ENABLE_XDB:BOOL=ON -DVISIT_PARADIS:BOOL=ON -DVISIT_MESA_DIR="/usr/gapps/visit/thirdparty_shared/2.13.0/mesa/7.10.2/linux-x86_64_gcc-4.8" >> ../../buildlog 2>&1
+/usr/gapps/visit/thirdparty_shared/3.0.0b/cmake/3.9.3/linux-x86_64_gcc-4.8/bin/cmake . -DCMAKE_BUILD_TYPE:STRING=Release -DVISIT_INSTALL_THIRD_PARTY:BOOL=ON -DVISIT_ENABLE_XDB:BOOL=ON -DVISIT_PARADIS:BOOL=ON -DVISIT_OSMESA_DIR="/usr/gapps/visit/thirdparty_shared/3.0.0b/osmesa/17.2.8/linux-x86_64_gcc-4.8" >> ../../buildlog 2>&1
 make -j 4 package >> ../../buildlog 2>&1
 mv visit\$ver2.linux-x86_64.tar.gz ../../visit\$ver2.linux-x86_64-wmesa.tar.gz
 cd ../..