Fix build on distros with custom toolchain files

Nheko-Reborn · Jan 13, 2023 · de04d88 · de04d88
1 parent f30d77a
commit de04d88
Show file tree

Hide file tree

Showing 5 changed files with 14 additions and 6 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,5 +1,13 @@
 # Changelog
 
+## [0.9.1] -- 2023-01-13
+
+- Fix building with user specified toolchain files.
+
+We still specified C++17 as the C++ standard, which was overwritten by our
+toolchain file, but some distros use their own, so this fixes the build for
+them. (This probably only affects building the tests and examples.)
+
 ## [0.9.0] -- 2023-01-12
 
 - Support error formatting using {fmt}/spdlog.

diff --git a/CMakeLists.txt b/CMakeLists.txt
@@ -8,7 +8,7 @@ set(
 	FILEPATH
 	"Default toolchain"
 	)
-set(CMAKE_CXX_STANDARD 17 CACHE STRING "C++ standard")
+set(CMAKE_CXX_STANDARD 20 CACHE STRING "C++ standard")
 set(CMAKE_CXX_STANDARD_REQUIRED ON CACHE BOOL "Require C++ standard to be supported")
 set(CMAKE_POSITION_INDEPENDENT_CODE ON CACHE BOOL "compile as PIC by default")
 
@@ -38,12 +38,12 @@ option(USE_BUNDLED_RE2 "Use the bundled version of re2." ${HUNTER_ENABLED})
 
 if (CMAKE_VERSION VERSION_GREATER_EQUAL 3.12)
 project(matrix_client
-	VERSION 0.9.0
+	VERSION 0.9.1
 	DESCRIPTION "Client API library for Matrix."
 	HOMEPAGE_URL https://github.com/Nheko-Reborn/mtxclient)
 else()
 project(matrix_client
-	VERSION 0.9.0
+	VERSION 0.9.1
 	DESCRIPTION "Client API library for Matrix.")
 endif()
 

diff --git a/appveyor.yml b/appveyor.yml
@@ -1,6 +1,6 @@
 ---
 
-version: 0.9.0-{build}
+version: 0.9.1-{build}
 
 configuration: Release
 image: Visual Studio 2022

diff --git a/lib/http/client.cpp b/lib/http/client.cpp
@@ -61,7 +61,7 @@ coeurl::Headers
 mtx::http::Client::prepare_headers(bool requires_auth)
 {
     coeurl::Headers headers;
-    headers["User-Agent"] = "mtxclient v0.9.0";
+    headers["User-Agent"] = "mtxclient v0.9.1";
 
     if (requires_auth && !access_token_.empty())
         headers["Authorization"] = "Bearer " + access_token();

diff --git a/meson.build b/meson.build
@@ -1,7 +1,7 @@
 project(
   'mtxclient',
   'cpp',
-version : '0.9.0',
+version : '0.9.1',
 meson_version : '>=0.57.0',
 license : 'MIT',
 default_options : 'cpp_std=c++20'