From df4fe0bc57f344df697b509d5ca1debf2f322d61 Mon Sep 17 00:00:00 2001 From: Mateusz Pusz Date: Thu, 28 Jan 2021 18:51:48 +0100 Subject: [PATCH] build: CMakeDeps support added --- conanfile.py | 6 ++++-- test_package/conanfile.py | 5 +++-- 2 files changed, 7 insertions(+), 4 deletions(-) diff --git a/conanfile.py b/conanfile.py index aa942541..a2b041ff 100644 --- a/conanfile.py +++ b/conanfile.py @@ -22,7 +22,7 @@ from conans import ConanFile, tools from conans.tools import Version, check_min_cppstd -from conan.tools.cmake import CMakeToolchain, CMake +from conan.tools.cmake import CMakeToolchain, CMake, CMakeDeps from conans.errors import ConanInvalidConfiguration import re @@ -65,7 +65,7 @@ class UnitsConan(ConanFile): # "revision": "auto", # "submodule": "recursive" # } - generators = "cmake_find_package_multi", "cmake_paths" + generators = "cmake_paths" @property def _run_tests(self): @@ -114,6 +114,8 @@ class UnitsConan(ConanFile): # 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.generate() + deps = CMakeDeps(self) + deps.generate() def build(self): cmake = self._configure_cmake() diff --git a/test_package/conanfile.py b/test_package/conanfile.py index c2f4224c..d6ed6b6c 100644 --- a/test_package/conanfile.py +++ b/test_package/conanfile.py @@ -21,15 +21,16 @@ # SOFTWARE. from conans import ConanFile, tools, RunEnvironment -from conan.tools.cmake import CMakeToolchain, CMake +from conan.tools.cmake import CMakeToolchain, CMake, CMakeDeps class TestPackageConan(ConanFile): settings = "os", "compiler", "build_type", "arch" - generators = "cmake_find_package_multi" def generate(self): tc = CMakeToolchain(self) tc.generate() + deps = CMakeDeps(self) + deps.generate() def build(self): cmake = CMake(self)