mpusz/mp-units
1
0
Fork 1
mirror of https://github.com/mpusz/mp-units.git synced 2025-08-02 03:44:27 +02:00
Code Issues Packages Projects Releases Wiki Activity

cppstd moved to compiler.cppstd

Browse Source
This commit is contained in:
Mateusz Pusz
2019-05-08 15:09:42 -06:00
parent e5ee2cd381
commit aca7861faf
2 changed files with 7 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
conanfile.py
View File

@@ -43,7 +43,7 @@ class UnitsConan(ConanFile):
url = "https://github.com/mpusz/units" url = "https://github.com/mpusz/units"
description = "Physical Units library for C++" description = "Physical Units library for C++"
exports = ["LICENSE.md"] exports = ["LICENSE.md"]
settings = "cppstd", "os", "compiler", "build_type", "arch" settings = "os", "compiler", "build_type", "arch"
requires = ( requires = (
"cmcstl2/2019.03.18@mpusz/stable", "cmcstl2/2019.03.18@mpusz/stable",
"gsl-lite/0.33.0@nonstd-lite/stable" "gsl-lite/0.33.0@nonstd-lite/stable"
@@ -58,9 +58,11 @@ class UnitsConan(ConanFile):
def configure(self): def configure(self):
if self.settings.compiler != "gcc": if self.settings.compiler != "gcc":
raise ConanInvalidConfiguration("Library units works only with gcc") raise ConanInvalidConfiguration("Library works only with gcc")
if self.settings.cppstd not in ["20", "gnu20"]: # if int(self.settings.compiler.version) < 8:
raise ConanInvalidConfiguration("Library units requires at least C++20 support") # raise ConanInvalidConfiguration("Library works only with at least gcc 8.0")
if self.settings.compiler.cppstd not in ["20", "gnu20"]:
raise ConanInvalidConfiguration("Library requires at least C++20 support")
def _configure_cmake(self): def _configure_cmake(self):
cmake = CMake(self) cmake = CMake(self)

2
test_package/conanfile.py
View File

@@ -24,7 +24,7 @@ from conans import ConanFile, CMake, tools, RunEnvironment
import os import os
class TestPackageConan(ConanFile): class TestPackageConan(ConanFile):
settings = "cppstd", "os", "compiler", "build_type", "arch" settings = "os", "compiler", "build_type", "arch"
generators = "cmake" generators = "cmake"
def build(self): def build(self):