mpusz/mp-units
1
0
Fork 1
mirror of https://github.com/mpusz/mp-units.git synced 2025-07-31 02:47:16 +02:00
Code Issues Packages Projects Releases Wiki Activity

build: CMake generator is no longer obtained from an enviornment variable

Browse Source 
Use Conan's `tools.cmake.cmaketoolchain:generator` `[conf]` option to set required generator
This commit is contained in:
Mateusz Pusz
2021-09-09 09:01:05 +02:00
parent df45eafac0
commit 32868c9721
2 changed files with 2 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
conanfile.py
View File

@ -105,7 +105,7 @@ class UnitsConan(ConanFile):
self.folders.source="." if self._run_tests else "src" self.folders.source="." if self._run_tests else "src"
def generate(self): def generate(self):
tc = CMakeToolchain(self, generator=os.getenv("CONAN_CMAKE_GENERATOR")) tc = CMakeToolchain(self)
tc.variables["UNITS_DOWNCAST_MODE"] = str(self.options.downcast_mode).upper() tc.variables["UNITS_DOWNCAST_MODE"] = str(self.options.downcast_mode).upper()
# if self._run_tests: # TODO Enable this when environment is supported in the Conan toolchain # if self._run_tests: # TODO Enable this when environment is supported in the Conan toolchain
tc.variables["UNITS_BUILD_DOCS"] = self.options.build_docs tc.variables["UNITS_BUILD_DOCS"] = self.options.build_docs

2
test_package/conanfile.py
View File

@ -28,7 +28,7 @@ class TestPackageConan(ConanFile):
settings = "os", "compiler", "build_type", "arch" settings = "os", "compiler", "build_type", "arch"
def generate(self): def generate(self):
tc = CMakeToolchain(self, generator=os.getenv("CONAN_CMAKE_GENERATOR")) tc = CMakeToolchain(self)
tc.generate() tc.generate()
deps = CMakeDeps(self) deps = CMakeDeps(self)
deps.generate() deps.generate()