noury/mirror-chatterino2
1
0
Fork 0
mirror of https://github.com/Chatterino/chatterino2.git synced 2024-11-13 19:49:51 +01:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #1173 from AnotherFoxGuy/boost-conan

Browse source 
👷 Manage Boost with conan
This commit is contained in:
pajlada 2019-08-03 11:46:23 +02:00 committed by GitHub
parent 45e2887ce8 654712ed64
commit 8b1f9e91b4
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
3 changed files with 3 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
appveyor.yml
View file

@ -28,7 +28,7 @@ build_script:
conan install .. 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 set cl=/MP

2
chatterino.pro
View file

@ -43,7 +43,6 @@ macx {
DEFINES += IRC_NAMESPACE=Communi DEFINES += IRC_NAMESPACE=Communi
include(lib/appbase.pri) include(lib/appbase.pri)
include(lib/boost.pri)
include(lib/fmt.pri) include(lib/fmt.pri)
include(lib/humanize.pri) include(lib/humanize.pri)
include(lib/libcommuni.pri) include(lib/libcommuni.pri)
@ -62,6 +61,7 @@ exists( $$OUT_PWD/conanbuildinfo.pri ) {
LIBS += -lGdi32 LIBS += -lGdi32
} }
else{ else{
include(lib/boost.pri)
include(lib/openssl.pri) include(lib/openssl.pri)
} }

1
conanfile.txt
View file

@ -1,5 +1,6 @@
[requires] [requires]
OpenSSL/1.0.2o@conan/stable OpenSSL/1.0.2o@conan/stable
boost/1.69.0@conan/stable
[generators] [generators]
qmake qmake