diff options
| author | James <james@conan.io> | 2021-09-13 16:12:58 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2021-09-13 16:12:58 +0200 |
| commit | 03c344aba82bd35d1185deec47effa25203274e9 (patch) | |
| tree | a1cb5fe5facabbc2094ba3480adb013027e06719 | |
| parent | acfaf917a14f078c47202e3d823664ea72f57de6 (diff) | |
updating test cmakedeps, requires cmake 3.15.7 (#9598)
* updating test cmakedeps, requries cmake 3.15.7
* remove patch
* remove unnecessary generators
| -rw-r--r-- | conans/test/functional/command/devflow_test.py | 2 | ||||
| -rw-r--r-- | conans/test/functional/toolchains/cmake/cmakedeps/test_cmakedeps_versions.py | 18 |
2 files changed, 10 insertions, 10 deletions
diff --git a/conans/test/functional/command/devflow_test.py b/conans/test/functional/command/devflow_test.py index 5f04fc90..93642eb1 100644 --- a/conans/test/functional/command/devflow_test.py +++ b/conans/test/functional/command/devflow_test.py @@ -17,7 +17,6 @@ class ConanFileToolsTest(ConanFile): name = "Pkg" version = "0.1" exports_sources = "*" - generators = "cmake" def build(self): self.output.info("Source files: %s" % load(os.path.join(self.source_folder, "file.h"))) @@ -130,7 +129,6 @@ import os class ConanFileToolsTest(ConanFile): name = "Pkg" version = "0.1" - generators = "cmake" def source(self): save("file.h", "file_h_contents!") diff --git a/conans/test/functional/toolchains/cmake/cmakedeps/test_cmakedeps_versions.py b/conans/test/functional/toolchains/cmake/cmakedeps/test_cmakedeps_versions.py index 6c9be4c3..11078db8 100644 --- a/conans/test/functional/toolchains/cmake/cmakedeps/test_cmakedeps_versions.py +++ b/conans/test/functional/toolchains/cmake/cmakedeps/test_cmakedeps_versions.py @@ -9,8 +9,8 @@ from conans.test.utils.tools import TestClient @pytest.fixture(scope="module") def hello_client(): client = TestClient() - client.run("new hello/1.1 -s") - client.run("create .") + client.run("new hello/1.1 --template=cmake_lib") + client.run("create . -tf=None") return client @@ -44,12 +44,13 @@ def test_version(hello_client, name, version, params, cmake_fails, package_found """).format(name=name, version=version, params=params) conanfile = textwrap.dedent(""" - from conans import ConanFile, CMake + from conans import ConanFile + from conan.tools.cmake import CMake class Conan(ConanFile): - settings = "build_type" requires = "hello/1.1" - generators = "CMakeDeps" + settings = "os", "compiler", "arch", "build_type" + generators = "CMakeDeps", "CMakeToolchain" def build(self): cmake = CMake(self) @@ -78,12 +79,13 @@ def test_no_version_file(hello_client): """) conanfile = textwrap.dedent(""" - from conans import ConanFile, CMake + from conans import ConanFile + from conan.tools.cmake import CMake class Conan(ConanFile): - settings = "build_type" + settings = "os", "compiler", "arch", "build_type" requires = "hello/1.1" - generators = "CMakeDeps" + generators = "CMakeDeps", "CMakeToolchain" def build(self): cmake = CMake(self) |