From cddd998932fc07e920273e81f1006e665013fac5 Mon Sep 17 00:00:00 2001
From: Lars Bilke <lars.bilke@ufz.de>
Date: Thu, 15 Jan 2015 16:43:45 +0100
Subject: [PATCH] MinGW fixes.
---
BaseLib/MemWatch.cpp | 4 ++--
scripts/cmake/ExternalProjectBoost.cmake | 5 ++++-
2 files changed, 6 insertions(+), 3 deletions(-)
diff --git a/BaseLib/MemWatch.cpp b/BaseLib/MemWatch.cpp
index 48873f90f46..b874da19a4a 100644
--- a/BaseLib/MemWatch.cpp
+++ b/BaseLib/MemWatch.cpp
@@ -14,7 +14,7 @@
#include "MemWatch.h"
-#if !defined(WIN32) && !defined(__APPLE__)
+#if !defined(WIN32) && !defined(__APPLE__) && !defined(__MINGW32__)
#include <iostream>
#include <fstream>
#include <string>
@@ -32,7 +32,7 @@ MemWatch::MemWatch ()
unsigned MemWatch::updateMemUsage ()
{
-#if !defined(WIN32) && !defined(__APPLE__)
+#if !defined(WIN32) && !defined(__APPLE__) && !defined(__MINGW32__)
std::string fname ("/proc/");
std::stringstream str_pid;
str_pid << static_cast<unsigned> (getpid());
diff --git a/scripts/cmake/ExternalProjectBoost.cmake b/scripts/cmake/ExternalProjectBoost.cmake
index 74e864b47e9..47892a436c5 100644
--- a/scripts/cmake/ExternalProjectBoost.cmake
+++ b/scripts/cmake/ExternalProjectBoost.cmake
@@ -52,13 +52,16 @@ IF(NOT Boost_INCLUDE_DIRS)
IF(APPLE)
SET(BOOST_ROOT $ENV{HOMEBREW_ROOT})
ENDIF()
- IF(WIN32)
+ IF(MSVC)
SET(Boost_USE_STATIC_LIBS ON)
IF(NOT DEFINED BOOST_LIBRARYDIR)
SET(BOOST_LIBRARYDIR "$ENV{CMAKE_LIBRARY_SEARCH_PATH}/boost/lib${BITS}-${BOOST_TOOLSET};C:/boost/lib${BITS}-${BOOST_TOOLSET};$ENV{BOOST_ROOT}/lib${BITS}-${BOOST_TOOLSET}")
SET(BOOST_INCLUDEDIR "$ENV{CMAKE_LIBRARY_SEARCH_PATH}/boost;C:/boost;$ENV{BOOST_ROOT}")
ENDIF()
ENDIF()
+ IF(WIN32 AND COMPILER_IS_GCC)
+ SET(BOOST_INCLUDEDIR "$ENV{CMAKE_LIBRARY_SEARCH_PATH}/include/boost*")
+ ENDIF()
FIND_PACKAGE(Boost 1.46.0 COMPONENTS ${BOOST_LIBS_TO_BUILD})
IF(Boost_FOUND)
SET(Boost_FOUND TRUE CACHE BOOL "Was Boost found?" FORCE)
--
GitLab