release v2.5.0

marzer · Aug 11, 2021 · 037bfdd · 037bfdd
1 parent 4f21332
commit 037bfdd
Show file tree

Hide file tree

Showing 8 changed files with 15 additions and 34 deletions.
diff --git a/CMakeLists.txt b/CMakeLists.txt
@@ -2,7 +2,7 @@ cmake_minimum_required(VERSION 3.14)
 
 project(
     tomlplusplus
-    VERSION 2.4.0
+    VERSION 2.5.0
     DESCRIPTION "Header-only TOML config file parser and serializer for C++17 (and later!)"
     HOMEPAGE_URL "https://marzer.github.io/tomlplusplus/"
     LANGUAGES CXX

diff --git a/README.md b/README.md
@@ -97,13 +97,13 @@ You'll find some more code examples in the `examples` directory, and plenty more
 2. `#include <toml++/toml.h>`
 
 ### Conan
-Add `tomlplusplus/2.4.0` to your conanfile.
+Add `tomlplusplus/2.5.0` to your conanfile.
 
 ### DDS
 Add `tomlpp` to your `package.json5`, e.g.:
 ```
 depends: [
-    'tomlpp^2.4.0',
+    'tomlpp^2.5.0',
 ]
 ```
 > ℹ&#xFE0F; _[What is DDS?](https://dds.pizza/)_
@@ -114,23 +114,12 @@ vcpkg install tomlplusplus
 ```
 
 ### CMake FetchContent
-Using the tar archive
-```
-include(FetchContent)
-FetchContent_Declare(
-    tomlplusplus
-    URL https://github.com/marzer/tomlplusplus/archive/refs/tags/v2.4.0.tar.gz
-    URL_HASH MD5=546d163e5f37d9bbdc5e19702aaaac8f
-)
-FetchContent_MakeAvailable(tomlplusplus)
-```
-Using the git tag
 ```
 include(FetchContent)
 FetchContent_Declare(
     tomlplusplus
     GIT_REPOSITORY https://github.com/marzer/tomlplusplus.git
-    GIT_TAG        v2.4.0
+    GIT_TAG        v2.5.0
 )
 FetchContent_MakeAvailable(tomlplusplus)
 ```

diff --git a/docs/pages/main_page.dox b/docs/pages/main_page.dox
@@ -427,15 +427,15 @@
 
 
  \subsection mainpage-adding-lib-conan Conan
- Add `tomlplusplus/2.4.0` to your conanfile.
+ Add `tomlplusplus/2.5.0` to your conanfile.
 
 
 
  \subsection mainpage-adding-lib-dds DDS
  Add `tomlpp` to your `package.json5`, e.g.:
  \bash
  depends: [
-		'tomlpp^2.4.0',
+		'tomlpp^2.5.0',
  ]
  \ebash
 
@@ -457,24 +457,12 @@
 
  \subsection mainpage-adding-lib-cmake-fetch-content CMake FetchContent
 
- Using the tar archive
- \code{.cmake}
- include(FetchContent)
- FetchContent_Declare(
-     tomlplusplus
-     URL https://github.com/marzer/tomlplusplus/archive/refs/tags/v2.4.0.tar.gz
-     URL_HASH MD5=546d163e5f37d9bbdc5e19702aaaac8f
- )
- FetchContent_MakeAvailable(tomlplusplus)
- \endcode
-
- Using the git tag
  \code{.cmake}
  include(FetchContent)
  FetchContent_Declare(
      tomlplusplus
      GIT_REPOSITORY https://github.com/marzer/tomlplusplus.git
-     GIT_TAG        v2.4.0
+     GIT_TAG        v2.5.0
  )
  FetchContent_MakeAvailable(tomlplusplus)
  \endcode

diff --git a/include/toml++/toml_version.h b/include/toml++/toml_version.h
@@ -6,7 +6,7 @@
 #pragma once
 
 #define TOML_LIB_MAJOR		2
-#define TOML_LIB_MINOR		4
+#define TOML_LIB_MINOR		5
 #define TOML_LIB_PATCH		0
 
 #define TOML_LANG_MAJOR		1

diff --git a/meson.build b/meson.build
@@ -1,7 +1,7 @@
 project(
 	'tomlplusplus',
 	'cpp',
-	version : '2.4.0',
+	version : '2.5.0',
 	meson_version : '>=0.53.0',
 	license : 'MIT',
 	default_options : [ # https://mesonbuild.com/Builtin-options.html

diff --git a/toml++.vcxproj b/toml++.vcxproj
@@ -71,6 +71,7 @@
     <None Include=".runsettings" />
     <None Include="cmake\install-rules.cmake" />
     <None Include="cmake\project-is-top-level.cmake" />
+    <None Include="cmake\tomlplusplus.cmake.in" />
     <None Include="cmake\tomlplusplusConfig.cmake" />
     <None Include="cmake\variables.cmake" />
     <None Include="CODE_OF_CONDUCT.md" />

diff --git a/toml++.vcxproj.filters b/toml++.vcxproj.filters
@@ -131,6 +131,9 @@
     <None Include="cmake\variables.cmake">
       <Filter>cmake</Filter>
     </None>
+    <None Include="cmake\tomlplusplus.cmake.in">
+      <Filter>cmake</Filter>
+    </None>
   </ItemGroup>
   <ItemGroup>
     <Filter Include=".circleci">

diff --git a/toml.hpp b/toml.hpp
@@ -1,6 +1,6 @@
 //----------------------------------------------------------------------------------------------------------------------
 //
-// toml++ v2.4.0
+// toml++ v2.5.0
 // https://github.com/marzer/tomlplusplus
 // SPDX-License-Identifier: MIT
 //
@@ -700,7 +700,7 @@ is no longer necessary.
 #endif
 
 #define TOML_LIB_MAJOR		2
-#define TOML_LIB_MINOR		4
+#define TOML_LIB_MINOR		5
 #define TOML_LIB_PATCH		0
 
 #define TOML_LANG_MAJOR		1