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

build: Conan layout support added

Browse Source 
Conan 1.40 no longer supports providing source folder in `cmake.configure()`
This commit is contained in:
Mateusz Pusz
2021-09-09 08:58:52 +02:00
parent 7a833e496e
commit df45eafac0
1 changed files with 4 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
conanfile.py
View File

@@ -101,6 +101,9 @@ class UnitsConan(ConanFile):
# # build_docs has sense only in a development or CI build # # build_docs has sense only in a development or CI build
# del self.options.build_docs # del self.options.build_docs
def layout(self):
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, generator=os.getenv("CONAN_CMAKE_GENERATOR"))
tc.variables["UNITS_DOWNCAST_MODE"] = str(self.options.downcast_mode).upper() tc.variables["UNITS_DOWNCAST_MODE"] = str(self.options.downcast_mode).upper()
@@ -112,7 +115,7 @@ class UnitsConan(ConanFile):
def build(self): def build(self):
cmake = CMake(self) cmake = CMake(self)
cmake.configure(source_folder=None if self._run_tests else "src") cmake.configure()
cmake.build() cmake.build()
if self._run_tests: if self._run_tests:
cmake.test(output_on_failure=True) cmake.test(output_on_failure=True)