diff options
| author | Felix Morgner <felix.morgner@gmail.com> | 2020-01-05 15:10:43 +0100 |
|---|---|---|
| committer | Felix Morgner <felix.morgner@gmail.com> | 2020-01-05 15:10:43 +0100 |
| commit | 467feab6838f5688680def7ca75fac034e1d5a6b (patch) | |
| tree | e1f05bce28b6004ce2e92b7cb751b692ec316c5d | |
| parent | c00d0f0ff482eb439ec73fc7a639debe6014572e (diff) | |
| parent | f00fb5779dcf2443b74d114093afbbd2441523ad (diff) | |
| download | newtype-467feab6838f5688680def7ca75fac034e1d5a6b.tar.xz newtype-467feab6838f5688680def7ca75fac034e1d5a6b.zip | |
Merge tag 'v1.0.2' into develop
newtype 1.0.2 - Francesca.2
Conan Package: fix C++ standard version flag for GCC
| -rw-r--r-- | CMakeLists.txt | 2 | ||||
| -rw-r--r-- | conanfile.py | 4 | ||||
| -rw-r--r-- | include/newtype/version.hpp | 2 |
3 files changed, 4 insertions, 4 deletions
diff --git a/CMakeLists.txt b/CMakeLists.txt index 93f154e..ba03c5f 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -1,7 +1,7 @@ cmake_minimum_required(VERSION "3.9.0") project("newtype" - VERSION "1.0.1" + VERSION "1.0.2" LANGUAGES CXX DESCRIPTION "A library of types and functions to create strong type aliases" ) diff --git a/conanfile.py b/conanfile.py index 51a159a..8b3e147 100644 --- a/conanfile.py +++ b/conanfile.py @@ -47,5 +47,5 @@ class NewtypeConan(ConanFile): cmake.install() def package_info(self): - if self.settings.compiler in ["gcc", "clang"]: - self.cpp_info.cxxflags = "-std=c++20"
\ No newline at end of file + if self.settings.compiler in ["gcc"]: + self.cpp_info.cxxflags.append("-std=c++2a")
\ No newline at end of file diff --git a/include/newtype/version.hpp b/include/newtype/version.hpp index be6e26e..b2dd19b 100644 --- a/include/newtype/version.hpp +++ b/include/newtype/version.hpp @@ -14,7 +14,7 @@ namespace nt } version{ .major = 1, .minor = 0, - .patch = 1, + .patch = 2, .name = "Francesca", }; |