From b414b69f5c37c254e743da52e63b8611196b4cf2 Mon Sep 17 00:00:00 2001 From: iDunk5400 Date: Thu, 18 Apr 2019 17:00:13 +0200 Subject: [PATCH 1/2] Windows: fix a build error in MSYS2 with boost 1.70.0 --- src/common/util.cpp | 3 +++ 1 file changed, 3 insertions(+) diff --git a/src/common/util.cpp b/src/common/util.cpp index 3388974ce..db5aa3052 100644 --- a/src/common/util.cpp +++ b/src/common/util.cpp @@ -69,6 +69,9 @@ using namespace epee; #include "net/http_client.h" // epee::net_utils::... #ifdef WIN32 +#ifndef STRSAFE_NO_DEPRECATE +#define STRSAFE_NO_DEPRECATE +#endif #include #include #include From 0f52fe4c9c2cb798cac298cc008b18661d42e89c Mon Sep 17 00:00:00 2001 From: iDunk5400 Date: Thu, 18 Apr 2019 19:41:14 +0200 Subject: [PATCH 2/2] Windows: work around a boost 1.70 and cmake SNAFU Boost got upgraded to 1.70.0 in MSYS2. As a result, cmake (v3.13.4 as of this commit) can not configure boost properly, and cmake configuration fails as a result. This is a workaround as per https://gitlab.kitware.com/cmake/cmake/issues/18865 --- CMakeLists.txt | 1 + 1 file changed, 1 insertion(+) diff --git a/CMakeLists.txt b/CMakeLists.txt index f40021764..c19c9dba7 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -878,6 +878,7 @@ set(OLD_LIB_SUFFIXES ${CMAKE_FIND_LIBRARY_SUFFIXES}) if(STATIC) if(MINGW) set(CMAKE_FIND_LIBRARY_SUFFIXES .a) + set(Boost_NO_BOOST_CMAKE ON) endif() set(Boost_USE_STATIC_LIBS ON)