From 32868c97212ce4919d80f3d92f0b6ebc6c5dbb6e Mon Sep 17 00:00:00 2001 From: Mateusz Pusz Date: Thu, 9 Sep 2021 09:01:05 +0200 Subject: [PATCH] build: CMake generator is no longer obtained from an enviornment variable Use Conan's `tools.cmake.cmaketoolchain:generator` `[conf]` option to set required generator --- conanfile.py | 2 +- test_package/conanfile.py | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/conanfile.py b/conanfile.py index 71fa18c5..2e4dad34 100644 --- a/conanfile.py +++ b/conanfile.py @@ -105,7 +105,7 @@ class UnitsConan(ConanFile): self.folders.source="." if self._run_tests else "src" 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() # if self._run_tests: # TODO Enable this when environment is supported in the Conan toolchain tc.variables["UNITS_BUILD_DOCS"] = self.options.build_docs diff --git a/test_package/conanfile.py b/test_package/conanfile.py index f72ce180..96c2f2b9 100644 --- a/test_package/conanfile.py +++ b/test_package/conanfile.py @@ -28,7 +28,7 @@ class TestPackageConan(ConanFile): settings = "os", "compiler", "build_type", "arch" def generate(self): - tc = CMakeToolchain(self, generator=os.getenv("CONAN_CMAKE_GENERATOR")) + tc = CMakeToolchain(self) tc.generate() deps = CMakeDeps(self) deps.generate()