👷 Manage Boost with conan

This commit is contained in:
Edgar
2019-08-03 11:36:04 +02:00
parent e7d9422431
commit 654712ed64
3 changed files with 3 additions and 2 deletions
+1 -1
View File
@@ -28,7 +28,7 @@ build_script:
conan install ..
qmake ../chatterino.pro BOOST_DIRECTORY="C:\Libraries\boost_1_64_0" BOOST_LIB_SUFFIX="lib64-msvc-14.1" DEFINES+="CHATTERINO_NIGHTLY_VERSION_STRING=\\\"$$system(git describe --always)-$$system(git rev-list master --count)\\\""
qmake ../chatterino.pro DEFINES+="CHATTERINO_NIGHTLY_VERSION_STRING=\\\"$$system(git describe --always)-$$system(git rev-list master --count)\\\""
set cl=/MP
+1 -1
View File
@@ -43,7 +43,6 @@ macx {
DEFINES += IRC_NAMESPACE=Communi
include(lib/appbase.pri)
include(lib/boost.pri)
include(lib/fmt.pri)
include(lib/humanize.pri)
include(lib/libcommuni.pri)
@@ -62,6 +61,7 @@ exists( $$OUT_PWD/conanbuildinfo.pri ) {
LIBS += -lGdi32
}
else{
include(lib/boost.pri)
include(lib/openssl.pri)
}
+1
View File
@@ -1,5 +1,6 @@
[requires]
OpenSSL/1.0.2o@conan/stable
boost/1.69.0@conan/stable
[generators]
qmake