From 654712ed64ff1cb338d5d4bb0c5edf46bfe4e095 Mon Sep 17 00:00:00 2001
From: Edgar <Edgar@AnotherFoxGuy.com>
Date: Sat, 3 Aug 2019 11:36:04 +0200
Subject: [PATCH] :construction_worker: Manage Boost with conan

---
 appveyor.yml   | 2 +-
 chatterino.pro | 2 +-
 conanfile.txt  | 1 +
 3 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/appveyor.yml b/appveyor.yml
index f399d093..68f33908 100644
--- a/appveyor.yml
+++ b/appveyor.yml
@@ -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
 
diff --git a/chatterino.pro b/chatterino.pro
index 8c1479c7..956b8a63 100644
--- a/chatterino.pro
+++ b/chatterino.pro
@@ -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)
 }
 
diff --git a/conanfile.txt b/conanfile.txt
index 83602da8..d9bedecd 100644
--- a/conanfile.txt
+++ b/conanfile.txt
@@ -1,5 +1,6 @@
 [requires]
 OpenSSL/1.0.2o@conan/stable
+boost/1.69.0@conan/stable
 
 [generators]
 qmake