mirror of
https://github.com/QuasarApp/qca.git
synced 2025-04-27 12:04:31 +00:00
Merge remote-tracking branch 'origin/master' into qt5
This commit is contained in:
commit
e40307d108
@ -282,13 +282,13 @@ message(STATUS "Checking for certstore..")
|
||||
if( WIN32 )
|
||||
# USE BUILTIN
|
||||
else ( WIN32 )
|
||||
if ( ENV{QC_CERTSTORE_PATH} )
|
||||
if(EXISTS ENV{QC_CERTSTORE_PATH})
|
||||
if ( DEFINED ENV{QC_CERTSTORE_PATH} )
|
||||
if(EXISTS $ENV{QC_CERTSTORE_PATH})
|
||||
set( qca_CERTSTORE $ENV{QC_CERTSTORE_PATH})
|
||||
else(EXISTS ENV{QC_CERTSTORE_PATH})
|
||||
else(EXISTS $ENV{QC_CERTSTORE_PATH})
|
||||
# path to try
|
||||
endif(EXISTS ENV{QC_CERTSTORE_PATH})
|
||||
else( ENV{QC_CERTSTORE_PATH} )
|
||||
endif(EXISTS $ENV{QC_CERTSTORE_PATH})
|
||||
else( DEFINED ENV{QC_CERTSTORE_PATH} )
|
||||
set( toTry
|
||||
"/etc/ssl/certs/ca-certificates.crt"
|
||||
"/usr/share/ssl/cert.pem"
|
||||
@ -302,7 +302,7 @@ else ( WIN32 )
|
||||
set( qca_CERTSTORE ${_current_try})
|
||||
endif(EXISTS ${_current_try})
|
||||
endforeach (_current_try)
|
||||
endif( ENV{QC_CERTSTORE_PATH} )
|
||||
endif( DEFINED ENV{QC_CERTSTORE_PATH} )
|
||||
endif(WIN32)
|
||||
|
||||
if (qca_CERTSTORE)
|
||||
|
Loading…
x
Reference in New Issue
Block a user