From 9fd9e005048900173635657836340cdf82fbd45c Mon Sep 17 00:00:00 2001
From: Mateusz Pusz <mateusz.pusz@gmail.com>
Date: Thu, 9 Sep 2021 10:12:14 +0200
Subject: [PATCH] build: Conan 1.40 support fixed

---
 conanfile.py | 5 +----
 1 file changed, 1 insertion(+), 4 deletions(-)

diff --git a/conanfile.py b/conanfile.py
index e2bbf951..3590f22e 100644
--- a/conanfile.py
+++ b/conanfile.py
@@ -101,9 +101,6 @@ class UnitsConan(ConanFile):
     #         # build_docs has sense only in a development or CI build
     #         del self.options.build_docs
 
-    def layout(self):
-        self.folders.source="." if self._run_tests else "src"
-
     def generate(self):
         tc = CMakeToolchain(self)
         tc.variables["UNITS_DOWNCAST_MODE"] = str(self.options.downcast_mode).upper()
@@ -115,7 +112,7 @@ class UnitsConan(ConanFile):
 
     def build(self):
         cmake = CMake(self)
-        cmake.configure()
+        cmake.configure(build_script_folder=None if self._run_tests else "src")
         cmake.build()
         if self._run_tests:
             cmake.test(output_on_failure=True)