Merge pull request #1153 from AnotherFoxGuy/openssl-conan

👷 Manage OpenSSL libs with conan
This commit is contained in:
pajlada
2019-07-28 12:23:48 +02:00
committed by GitHub
3 changed files with 27 additions and 15 deletions
+10 -1
View File
@@ -48,7 +48,6 @@ include(lib/fmt.pri)
include(lib/humanize.pri)
include(lib/libcommuni.pri)
include(lib/websocketpp.pri)
include(lib/openssl.pri)
include(lib/wintoast.pri)
include(lib/signals.pri)
include(lib/settings.pri)
@@ -56,6 +55,16 @@ include(lib/serialize.pri)
include(lib/winsdk.pri)
include(lib/rapidjson.pri)
exists( $$OUT_PWD/conanbuildinfo.pri ) {
message("Using conan packages")
CONFIG += conan_basic_setup
include($$OUT_PWD/conanbuildinfo.pri)
LIBS += -lGdi32
}
else{
include(lib/openssl.pri)
}
# Optional feature: QtWebEngine
#exists ($(QTDIR)/include/QtWebEngine/QtWebEngine) {
# message(Using QWebEngine)