Update windows config-site. (#19268)

For python 3.9.18, zlib 1.2.13, adios2-2.10.0-rc1, blosc2 2.11.3, mfem 4.6. Added FindBlosc2, Modified call to FindBlosc to FindBlosc2, and moved it before the FindAdios2. Update FindAdios2 for windows.
visit-dav · Jan 31, 2024 · 27a9ab1 · 27a9ab1
1 parent ce1d694
commit 27a9ab1
Show file tree

Hide file tree

Showing 5 changed files with 27 additions and 11 deletions.
diff --git a/src/CMake/FindADIOS2.cmake b/src/CMake/FindADIOS2.cmake
@@ -34,7 +34,8 @@ if(NOT WIN32)
         adios2_perfstubs adios2_cxx11 adios2_core adios2_enet)
 else()
     SET_UP_THIRD_PARTY(ADIOS2 LIBS
-        adios2_c adios2_cxx11 adios2_core adios2_perfstubs)
+        adios2_c adios2_cxx11 adios2_core adios2_atl
+        adios2_dill adios2_ffs )
 endif()
 
 if(VISIT_PARALLEL)
@@ -44,6 +45,7 @@ if(VISIT_PARALLEL)
     else()
         SET_UP_THIRD_PARTY(ADIOS2_PAR LIBS
             adios2_c adios2_cxx11 adios2_core
+            adios2_atl adios2_dill adios2_ffs 
             adios2_c_mpi adios2_cxx11_mpi adios2_core_mpi)
     endif()
 endif()

diff --git a/src/CMake/FindBlosc2.cmake b/src/CMake/FindBlosc2.cmake
@@ -0,0 +1,8 @@
+# Copyright (c) Lawrence Livermore National Security, LLC and other VisIt
+# Project developers.  See the top-level LICENSE file for dates and other
+# details.  No copyright assignment is required to contribute to VisIt.
+
+# Use the BLOSC_DIR hint from the config-site .cmake file
+
+SET_UP_THIRD_PARTY(BLOSC2 LIBS libblosc2)
+
diff --git a/src/CMake/SetUpThirdParty.cmake b/src/CMake/SetUpThirdParty.cmake
@@ -589,11 +589,12 @@ if(NOT VISIT_BUILD_MINIMAL_PLUGINS OR VISIT_SELECTED_DATABASE_PLUGINS)
 
     include(${VISIT_SOURCE_DIR}/CMake/FindADIOS.cmake)
 
+    # adios2 needs blosc2
+    include(${VISIT_SOURCE_DIR}/CMake/FindBlosc2.cmake)
     include(${VISIT_SOURCE_DIR}/CMake/FindADIOS2.cmake)
 
     include(${VISIT_SOURCE_DIR}/CMake/FindADVIO.cmake)
 
-    include(${VISIT_SOURCE_DIR}/CMake/FindBlosc.cmake)
 
     include(${VISIT_SOURCE_DIR}/CMake/FindBoxlib.cmake)
 

diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
@@ -741,7 +741,7 @@ set(CXX_TEST_PATH ${CMAKE_RUNTIME_OUTPUT_DIRECTORY})
 include("${VISIT_SOURCE_DIR}/CMake/VisItOptions.cmake")
 
 # Set up placeholders for package vars: XXX_DIR
-foreach(pkg ADIOS ADIOS2 ADIOS2_PAR ADVIO BLOSC BOOST BOXLIB CFITSIO CGNS
+foreach(pkg ADIOS ADIOS2 ADIOS2_PAR ADVIO BLOSC2 BOOST BOXLIB CFITSIO CGNS
             CONDUIT DAMARIS EMBREE FMS GDAL GFORTRAN HDF5 HDF5_MPI H5PART ICET
             ISPC JPEG LLVM MDSPLUS MFEM MILI MOAB MOAB_MPI NEKTAR++ NETCDF
             OPENGL OPENEXR OSPRAY PIDX PYSIDE PYTHON QT QWT SILO SZIP TBB

diff --git a/src/config-site/windows.cmake b/src/config-site/windows.cmake
@@ -118,7 +118,7 @@ endif()
 if(MSVC_TOOLSET_VERSION LESS "143")
     VISIT_OPTION_DEFAULT(VISIT_PYTHON_DIR ${VISITHOME}/python/3.7.7)
 else()
-    VISIT_OPTION_DEFAULT(VISIT_PYTHON_DIR ${VISITHOME}/python/3.7.16)
+    VISIT_OPTION_DEFAULT(VISIT_PYTHON_DIR ${VISITHOME}/python/3.9.18)
 endif()
 
 
@@ -161,7 +161,11 @@ VISIT_OPTION_DEFAULT(VISIT_SZIP_DIR     ${VISITHOME}/szip/2.1.1)
 ## ZLIB
 ##
 set(ZLIB_LIB_NAME "zlib")
-VISIT_OPTION_DEFAULT(VISIT_ZLIB_DIR     ${VISITHOME}/zlib/1.2.11)
+if(MSVC_TOOLSET_VERSION LESS "143")
+    VISIT_OPTION_DEFAULT(VISIT_ZLIB_DIR     ${VISITHOME}/zlib/1.2.11)
+else()
+    VISIT_OPTION_DEFAULT(VISIT_ZLIB_DIR     ${VISITHOME}/zlib/1.2.13)
+endif()
 
 ##############################################################
 ##
@@ -239,7 +243,7 @@ VISIT_OPTION_DEFAULT(VISIT_H5PART_LIBDEP
 ##
 ## MFEM
 ##
-VISIT_OPTION_DEFAULT(VISIT_MFEM_DIR     ${VISITHOME}/mfem/4.4)
+VISIT_OPTION_DEFAULT(VISIT_MFEM_DIR     ${VISITHOME}/mfem/4.6)
 VISIT_OPTION_DEFAULT(VISIT_MFEM_INCDEP ZLIB_INCLUDE_DIR CONDUIT_INCLUDE_DIR TYPE STRING)
 
 ##
@@ -275,17 +279,18 @@ VISIT_OPTION_DEFAULT(VISIT_VTKM_DIR ${VISITHOME}/vtkm/v1.9.0)
 VISIT_OPTION_DEFAULT(VISIT_XDMF_DIR ${VISITHOME}/Xdmf/2.1.1)
 VISIT_OPTION_DEFAULT(VISIT_XDMF_LIBDEP 
     HDF5_LIBRARY_DIR HDF5_LIB ${VISIT_HDF5_LIBDEP}
-    ${VISITHOME}/vtk/${VTK_VERSION}/lib vtklibxml2-${VTK_MAJOR_VERSION}.${VTK_MINOR_VERSION}
+    ${VISIT_VTK_DIR}/lib vtklibxml2-${VTK_MAJOR_VERSION}.${VTK_MINOR_VERSION}
     TYPE STRING)
 
 
 ##
 ## ADIOS2
 ##
-SETUP_APP_VERSION(ADIOS2 2.7.1)
+VISIT_OPTION_DEFAULT(VISIT_BLOSC2_DIR ${VISITHOME}/blosc2/2.11.3)
+
+SETUP_APP_VERSION(ADIOS2 2.10.0-rc1)
 VISIT_OPTION_DEFAULT(VISIT_ADIOS2_DIR ${VISITHOME}/adios2/${ADIOS2_VERSION})
-if(VISIT_PARALLEL)
-  VISIT_OPTION_DEFAULT(VISIT_ADIOS2_PAR_DIR ${VISITHOME}/adios2/${ADIOS2_VERSION})
-endif()
+VISIT_OPTION_DEFAULT(VISIT_ADIOS2_PAR_DIR ${VISITHOME}/adios2/${ADIOS2_VERSION})
+#VISIT_OPTION_DEFAULT(VISIT_ADIOS2_LIBDEP  ${VISIT_BLOSC2_DIR}/lib libblosc2)
 
 unset(VISITHOME)