AuroraMiddleware/qt5base-lts
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

configurejson2cmake.py: openssl -> OpenSSL mapping

Browse Source 
Change-Id: I29480dfbd4f144e3d5620b43419ec46fb866cf4b
Reviewed-by: Liang Qi <liang.qi@qt.io>
This commit is contained in:
Albert Astals Cid 2019-02-12 10:34:19 +01:00
parent 4bfd6c010b
commit 92f81ebc21
2 changed files with 2 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/network/configure.cmake
View File

@ -166,7 +166,7 @@ qt_feature("openssl" PUBLIC PRIVATE
qt_feature_definition("openssl" "QT_NO_OPENSSL" NEGATE)
qt_feature("openssl_linked" PUBLIC PRIVATE
LABEL " Qt directly linked to OpenSSL"
CONDITION NOT QT_FEATURE_securetransport AND libs.openssl OR FIXME
CONDITION NOT QT_FEATURE_securetransport AND OpenSSL_FOUND
ENABLE INPUT_openssl STREQUAL 'linked'
DISABLE ( NOT INPUT_openssl STREQUAL 'linked' )
)

1
util/cmake/configurejson2cmake.py
View File

@ -74,6 +74,7 @@ def map_library(lib: str) -> Union[str, LibraryMapping, List[str]]:
'libudev': 'Libudev',
'lttng-ust': LibraryMapping(package='LTTngUST', resultVariable="LTTNGUST"),
'opengl': LibraryMapping(package="OpenGL", resultVariable="OpenGL_OpenGL"),
'openssl': 'OpenSSL',
'openssl_headers': LibraryMapping(package="OpenSSL", resultVariable="OPENSSL_INCLUDE_DIR", appendFoundSuffix=False),
'pcre2': ['PCRE2', 'REQUIRED'],
'posix_iconv': None,