Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

openssl: define OPENSSL_FOUND in CMakeDeps generator #12838

Merged
merged 2 commits into from
Sep 6, 2022
Merged

openssl: define OPENSSL_FOUND in CMakeDeps generator #12838

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
c36235f
define OPENSSL_FOUND in CMakeDeps also
SpaceIm Sep 5, 2022
755a0c5
few more conan v2 tools to satisfy hooks
SpaceIm Sep 5, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
11 changes: 5 additions & 6 deletions recipes/openssl/1.x.x/conanfile.py
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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
Expand Down Expand Up @@ -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()
Expand Down
19 changes: 9 additions & 10 deletions recipes/openssl/3.x.x/conanfile.py
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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
Expand Down Expand Up @@ -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):
Expand Down Expand Up @@ -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)
Expand All @@ -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()
Expand Down