From 1108e13cab7de79f9a4a4763f945ee121b6db66b Mon Sep 17 00:00:00 2001 From: Mateusz Pusz Date: Thu, 28 Jan 2021 14:12:13 +0100 Subject: [PATCH] build: test_package swithced to use new Conan toolchains --- test_package/CMakeLists.txt | 1 - test_package/conanfile.py | 7 ++++++- 2 files changed, 6 insertions(+), 2 deletions(-) diff --git a/test_package/CMakeLists.txt b/test_package/CMakeLists.txt index 446056c0..5a5e9986 100644 --- a/test_package/CMakeLists.txt +++ b/test_package/CMakeLists.txt @@ -27,4 +27,3 @@ find_package(mp-units CONFIG REQUIRED) add_executable(test_package test_package.cpp) target_link_libraries(test_package PRIVATE mp::units) -target_compile_features(test_package PRIVATE cxx_std_20) diff --git a/test_package/conanfile.py b/test_package/conanfile.py index 2fd170d7..c2f4224c 100644 --- a/test_package/conanfile.py +++ b/test_package/conanfile.py @@ -20,12 +20,17 @@ # OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE # SOFTWARE. -from conans import ConanFile, CMake, tools, RunEnvironment +from conans import ConanFile, tools, RunEnvironment +from conan.tools.cmake import CMakeToolchain, CMake class TestPackageConan(ConanFile): settings = "os", "compiler", "build_type", "arch" generators = "cmake_find_package_multi" + def generate(self): + tc = CMakeToolchain(self) + tc.generate() + def build(self): cmake = CMake(self) cmake.configure()