Merge pull request #1173 from AnotherFoxGuy/boost-conan
👷 Manage Boost with conan
This commit is contained in:
+1
-1
@@ -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
@@ -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,5 +1,6 @@
|
||||
[requires]
|
||||
OpenSSL/1.0.2o@conan/stable
|
||||
boost/1.69.0@conan/stable
|
||||
|
||||
[generators]
|
||||
qmake
|
||||
|
||||
Reference in New Issue
Block a user