From: Uwe Hermann <redacted>
Date: Sun, 20 Jan 2013 16:11:51 +0000 (+0100)
Subject: MinGW: Drop hardcoded BOOST_ROOT.
X-Git-Tag: pulseview-0.1.0~144
X-Git-Url: https://sigrok.org/gitweb/?p=pulseview.git;a=commitdiff_plain;h=a8369d07b7ac9b906b28e944f2452430b8f2dca3

MinGW: Drop hardcoded BOOST_ROOT.

This was somewhat useful when PulseView only needed header-only parts of
Boost, but since boost-thread is now also needed this is not sufficient
anymore and needs a different setup for native MinGW builds on Windows.

Cross-compile builds using 'sigrok-cross-mingw' from sigrok-util work
fine without it, though.
---

diff --git a/CMakeLists.txt b/CMakeLists.txt
index f9c53f40..c9173047 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -53,11 +53,6 @@ pkg_check_modules(PKGDEPS REQUIRED
 
 find_package(Qt4 REQUIRED)
 
-# On Windows/MinGW we explicitly point cmake to the Boost directory.
-if(WIN32)
-	set(BOOST_ROOT /usr/local)
-endif()
-
 if(WIN32)
 # On Windows/MinGW the we need to use 'thread_win32' instead of 'thread'.
 # The library is named libboost_thread_win32* (not libboost_thread*).