diff --git a/recipes/openssl/1.x.x/conanfile.py b/recipes/openssl/1.x.x/conanfile.py index 4002bcc2c4641..8483f75ebb8be 100644 --- a/recipes/openssl/1.x.x/conanfile.py +++ b/recipes/openssl/1.x.x/conanfile.py @@ -1,8 +1,9 @@ +from conan import ConanFile +from conan.errors import ConanInvalidConfiguration +from conan.tools.build import cross_building from conan.tools.files import rename, get, rmdir from conan.tools.microsoft import is_msvc, msvc_runtime_flag -from conan.tools.build import cross_building -from conan.errors import ConanInvalidConfiguration -from conans import ConanFile, AutoToolsBuildEnvironment, tools +from conans import AutoToolsBuildEnvironment, tools from contextlib import contextmanager from functools import total_ordering import fnmatch @@ -823,9 +824,7 @@ def package(self): @staticmethod def _create_cmake_module_variables(module_file): content = textwrap.dedent("""\ - if(DEFINED OpenSSL_FOUND) - set(OPENSSL_FOUND ${OpenSSL_FOUND}) - endif() + set(OPENSSL_FOUND TRUE) if(DEFINED OpenSSL_INCLUDE_DIR) set(OPENSSL_INCLUDE_DIR ${OpenSSL_INCLUDE_DIR}) endif() diff --git a/recipes/openssl/3.x.x/conanfile.py b/recipes/openssl/3.x.x/conanfile.py index d5d4f5eaefa64..ee14c8c94d4df 100644 --- a/recipes/openssl/3.x.x/conanfile.py +++ b/recipes/openssl/3.x.x/conanfile.py @@ -1,8 +1,9 @@ -from conan.tools.files import rename -from conan.tools.microsoft import is_msvc, msvc_runtime_flag -from conans import ConanFile, AutoToolsBuildEnvironment, tools +from conan import ConanFile +from conan.errors import ConanInvalidConfiguration from conan.tools.build import cross_building -from conans.errors import ConanInvalidConfiguration +from conan.tools.files import get, rename, rmdir +from conan.tools.microsoft import is_msvc, msvc_runtime_flag +from conans import AutoToolsBuildEnvironment, tools import contextlib import fnmatch import functools @@ -149,8 +150,8 @@ def _use_nmake(self): return self._is_clangcl or is_msvc(self) def source(self): - tools.get(**self.conan_data["sources"][self.version], - destination=self._source_subfolder, strip_root=True) + get(self, **self.conan_data["sources"][self.version], + destination=self._source_subfolder, strip_root=True) @property def _target(self): @@ -664,7 +665,7 @@ def package(self): else: self.copy("fips.so", src=provdir,dst="lib/ossl-modules") - tools.rmdir(os.path.join(self.package_folder, "lib", "pkgconfig")) + rmdir(self, os.path.join(self.package_folder, "lib", "pkgconfig")) self._create_cmake_module_variables( os.path.join(self.package_folder, self._module_file_rel_path) @@ -673,9 +674,7 @@ def package(self): @staticmethod def _create_cmake_module_variables(module_file): content = textwrap.dedent("""\ - if(DEFINED OpenSSL_FOUND) - set(OPENSSL_FOUND ${OpenSSL_FOUND}) - endif() + set(OPENSSL_FOUND TRUE) if(DEFINED OpenSSL_INCLUDE_DIR) set(OPENSSL_INCLUDE_DIR ${OpenSSL_INCLUDE_DIR}) endif()