-
Notifications
You must be signed in to change notification settings - Fork 1.8k
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
(#13739) CMake Conan 2.0 compatibility
* CMake Conan 2.0 compatibility * Fix lint errors * Avoid lint error with Conan 2.0 argument name * Avoid lint error with Conan 2.0 argument name * Removed unused imports * Handle Conan version disparities * Use basic_layout with Autotools Co-authored-by: Uilian Ries <[email protected]> * Call AutotoolsDeps generate Co-authored-by: Uilian Ries <[email protected]> * Call CMakeDeps generate Co-authored-by: Uilian Ries <[email protected]> * Update imports per suggestioned changes * Removed extra space * Remove extraneous items * Determine require_version in a version-agnostic manner * Use Conan 1.53 * Handle @ in ref * Fix lint errors * Bigger hammer * Remove PATH addition in package_id Co-authored-by: Chris Mc <[email protected]> * Use validate_build instead of validate * Moved Mac x86 check to validate() method. * Bump openssl version Co-authored-by: Chris Mc <[email protected]> * Add blank line to trigger CI build * Eliminate use of validate_build() * Restore use of validate_build() * Removed blank line to trigger CI * Add blank line to trigger CI * Added boostrap options and removed unneeded env. vars * Deal with Conan 1.x vs 2.0 inconsistencies * Fixed lint issue * Placate linter * Apply suggestions from code review Co-authored-by: SpaceIm <[email protected]> * Use save & load for bootstrap args; Use tool_requires in test packages * Eliminate use of validate_build; Add more settings to test recipes * Set PATH in package_info() for v1.x; Lower req. ver. to 1.50 * Apply suggestions from code review Co-authored-by: SpaceIm <[email protected]> * Added AutotoolsDeps generator; Eliminated can_run() from tests * Correct msvc version Co-authored-by: SpaceIm <[email protected]> * Use f-strings * Replace VirtualRunEnv with VirtualBuildEnv Co-authored-by: SpaceIm <[email protected]> Co-authored-by: Uilian Ries <[email protected]> Co-authored-by: Chris Mc <[email protected]> Co-authored-by: SpaceIm <[email protected]>
- Loading branch information
4 people
authored
Jan 14, 2023
1 parent
e131876
commit a2bd965
Showing
3 changed files
with
102 additions
and
91 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,23 +1,24 @@ | ||
| import os | ||
| from six import StringIO | ||
| from conan import ConanFile | ||
| from conan.tools.build import can_run | ||
| import re | ||
|
|
||
|
|
||
| class TestPackageConan(ConanFile): | ||
| settings = "os", "arch" | ||
| generators = "VirtualRunEnv" | ||
| settings = "os", "arch", "compiler", "build_type" | ||
| generators = "VirtualBuildEnv" | ||
| test_type = "explicit" | ||
|
|
||
| def requirements(self): | ||
| self.requires(self.tested_reference_str) | ||
| def build_requirements(self): | ||
| self.tool_requires(self.tested_reference_str) | ||
|
|
||
| def test(self): | ||
| if can_run(self): | ||
| output = StringIO() | ||
| self.run("cmake --version", env="conanrun", output=output) | ||
| output_str = str(output.getvalue()) | ||
| self.output.info("Installed version: {}".format(output_str)) | ||
| require_version = str(self.deps_cpp_info["cmake"].version) | ||
| self.output.info("Expected version: {}".format(require_version)) | ||
| assert_cmake_version = "cmake version %s" % require_version | ||
| assert(assert_cmake_version in output_str) | ||
| output = StringIO() | ||
| # Third arg to self.run renamed "stdout" in Conan 2.0 but 1.x linter doesn't like it | ||
| self.run("cmake --version", output) | ||
| output_str = str(output.getvalue()) | ||
| self.output.info("Installed version: {}".format(output_str)) | ||
| tokens = re.split('[@#]', self.tested_reference_str) | ||
| require_version = tokens[0].split("/", 1)[1] | ||
| self.output.info("Expected version: {}".format(require_version)) | ||
| assert_cmake_version = "cmake version %s" % require_version | ||
| assert(assert_cmake_version in output_str) |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,23 +1,23 @@ | ||
| import os | ||
| from six import StringIO | ||
| from conan import ConanFile | ||
| from conan.tools.build import can_run | ||
| import re | ||
|
|
||
|
|
||
| class TestPackageConan(ConanFile): | ||
| settings = "os", "arch" | ||
| settings = "os", "arch", "compiler", "build_type" | ||
| test_type = "explicit" | ||
|
|
||
| def requirements(self): | ||
| self.requires(self.tested_reference_str) | ||
| def build_requirements(self): | ||
| self.tool_requires(self.tested_reference_str) | ||
|
|
||
| def test(self): | ||
| if can_run(self): | ||
| output = StringIO() | ||
| self.run("cmake --version", output=output, run_environment=True) | ||
| output_str = str(output.getvalue()) | ||
| self.output.info("Installed version: {}".format(output_str)) | ||
| require_version = str(self.deps_cpp_info["cmake"].version) | ||
| self.output.info("Expected version: {}".format(require_version)) | ||
| assert_cmake_version = "cmake version %s" % require_version | ||
| assert(assert_cmake_version in output_str) | ||
| output = StringIO() | ||
| self.run("cmake --version", output=output, run_environment=False) | ||
| output_str = str(output.getvalue()) | ||
| self.output.info("Installed version: {}".format(output_str)) | ||
| tokens = re.split('[@#]', self.tested_reference_str) | ||
| require_version = tokens[0].split("/", 1)[1] | ||
| self.output.info("Expected version: {}".format(require_version)) | ||
| assert_cmake_version = "cmake version %s" % require_version | ||
| assert(assert_cmake_version in output_str) |