Skip to content
Snippets Groups Projects
Unverified Commit 5620a660 authored by williamfgc's avatar williamfgc Committed by GitHub
Browse files

Merge branch 'release' into enginenames

parents dc8f709b 3f988286
No related branches found
No related tags found
1 merge request!343Names of engines in Open: BPFile, DataMan, HDF5, ADIOS1. Case insensi…
...@@ -12,7 +12,7 @@ if(CMAKE_CURRENT_SOURCE_DIR STREQUAL CMAKE_CURRENT_BINARY_DIR) ...@@ -12,7 +12,7 @@ if(CMAKE_CURRENT_SOURCE_DIR STREQUAL CMAKE_CURRENT_BINARY_DIR)
"separate from the source directory") "separate from the source directory")
endif() endif()
project(ADIOS2 VERSION 2.0.0) project(ADIOS2 VERSION 2.1.0)
#------------------------------------------------------------------------------# #------------------------------------------------------------------------------#
# Some boilerplate to setup nice output directories # Some boilerplate to setup nice output directories
......
...@@ -7,10 +7,10 @@ ...@@ -7,10 +7,10 @@
#define ADIOSCONFIG_H_ #define ADIOSCONFIG_H_
/* ADIOS Version Information */ /* ADIOS Version Information */
#define ADIOS2_VERSION_MAJOR @ADIOS_VERSION_MAJOR@ #define ADIOS2_VERSION_MAJOR @ADIOS2_VERSION_MAJOR@
#define ADIOS2_VERSION_MINOR @ADIOS_VERSION_MINOR@ #define ADIOS2_VERSION_MINOR @ADIOS2_VERSION_MINOR@
#define ADIOS2_VERSION_PATCH @ADIOS_VERSION_PATCH@ #define ADIOS2_VERSION_PATCH @ADIOS2_VERSION_PATCH@
#define ADIOS2_VERSION @ADIOS_VERSION@ #define ADIOS2_VERSION @ADIOS2_VERSION@
/* /*
* ADIOS Build Information: * ADIOS Build Information:
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment