mirror of
https://github.com/mpusz/mp-units.git
synced 2025-07-30 02:17:16 +02:00
build: CMake generator is no longer obtained from an enviornment variable
Use Conan's `tools.cmake.cmaketoolchain:generator` `[conf]` option to set required generator
This commit is contained in:
@ -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
|
||||
|
@ -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()
|
||||
|
Reference in New Issue
Block a user