Unverified Commit 80ec3fd4 authored by Bolea Sanchez, Vicente Adolfo's avatar Bolea Sanchez, Vicente Adolfo Committed by GitHub
Browse files

Merge pull request #3735 from vicentebolea/backports-release_29 

Backports release 29
parents 1df3a064 2cfe548a

.gitattributes

0 → 100644
+22 −0
Original line number Diff line number Diff line 
# Set the default behavior, in case people don't have core.autocrlf set.

*       text=auto



# Explicitly declare text files you want to always be normalized and converted

# to native line endings on checkout.

*.cxx   text

*.h     text

*.hxx   text

*.tcc   text

*.cu    text

*.c     text

*.h     text

*.py    text

*.f90   text

*.F90   text

*.sh    text



*.cmake whitespace=tab-in-indent

*.md    whitespace=tab-in-indent whitespace=-blank-at-eol conflict-marker-size=79

*.rst   whitespace=tab-in-indent conflict-marker-size=79

*.txt   whitespace=tab-in-indent

*.xml   whitespace=tab-in-indent

cmake/ADIOSFunctions.cmake

+2 −0
Original line number Diff line number Diff line
@@ -99,10 +99,12 @@ function(GenerateADIOSHeaderConfig) 
")

    if(ADIOS2_HAVE_${OPT})

      set(ADIOS2_HAVE_${OPT_UPPER} 1)

      string(APPEND ADIOS2_CONFIG_FEATURE_LIST "\"${OPT_UPPER}\",")

    else()

      set(ADIOS2_HAVE_${OPT_UPPER})

    endif()

  endforeach()

  string(APPEND ADIOS2_CONFIG_FEATURE_LIST "nullptr")



  configure_file(

    ${ADIOS2_SOURCE_DIR}/source/adios2/common/ADIOSConfig.h.in

docs/requirements.txt

+3 −3
Original line number Diff line number Diff line
@@ -3,11 +3,11 @@ Babel==2.11.0 
blockdiag==3.0.0

breathe==4.33.0

brotlipy==0.7.0

certifi==2022.12.7

certifi==2023.7.22

cffi==1.15.1

charset-normalizer==2.1.1

colorama==0.4.6

cryptography==41.0.0

cryptography==41.0.2

docutils==0.17

funcparserlib==1.0.1

idna==3.4
@@ -21,7 +21,7 @@ packaging==22.0 
Pillow==9.4.0

pip==22.3.1

pycparser==2.21

Pygments==2.14.0

Pygments==2.15.0

pyOpenSSL==23.0.0

PySocks==1.7.1

pytz==2022.7

source/adios2/CMakeLists.txt

+6 −0
Original line number Diff line number Diff line
@@ -18,6 +18,7 @@ add_library(adios2_core 
  core/VariableBase.cpp

  core/Span.cpp core/Span.tcc

  core/Group.cpp core/Group.tcc

  core/Info.cpp



#operator

  operator/callback/Signature1.cpp
@@ -398,6 +399,11 @@ install(FILES common/ADIOSMacros.h common/ADIOSTypes.h common/ADIOSTypes.inl 
install(DIRECTORY core/

  DESTINATION ${CMAKE_INSTALL_INCLUDEDIR}/adios2/core COMPONENT adios2_core-development

  FILES_MATCHING PATTERN "*.h"

  PATTERN "Info.h" EXCLUDE

)



install(FILES core/Info.h

  DESTINATION ${CMAKE_INSTALL_INCLUDEDIR} COMPONENT adios2_core-development

)



install(DIRECTORY engine/

source/adios2/common/ADIOSConfig.h.in

+2 −0
Original line number Diff line number Diff line
@@ -31,6 +31,8 @@ 


@ADIOS2_CONFIG_DEFINES@



#define ADIOS2_FEATURE_LIST @ADIOS2_CONFIG_FEATURE_LIST@



/* Everything between here and the note above is programatically generated */



#ifndef ADIOS2_USE_MPI