37 lines
1.3 KiB
Diff
37 lines
1.3 KiB
Diff
|
From: Dave Plater <davejplater@gmail.com>
|
||
|
|
Date: 2018-11-18 10:52
|
||
|
|
Subject: Fix build against boost-1.68
|
||
|
|
Upstream: from upstream
|
||
|
|
|
||
|
|
In boost-1.68 "boost/uuid/sha1.hpp" is moved to
|
||
|
|
"boost/uuid/detail/sha1.hpp"
|
||
|
|
Patch copied from git #8bb0fabcba3b9344105b11d762b2360de9889fc0
|
||
|
|
The comit also includes a large number of debug fixes that are
|
||
|
|
not necessary and would make the patch very large.
|
||
|
|
|
||
|
|
Index: 3d-viewer/3d_cache/3d_cache.cpp
|
||
|
|
===================================================================
|
||
|
|
--- 3d-viewer/3d_cache/3d_cache.cpp.orig 2018-07-13 21:53:52.000000000 +0200
|
||
|
|
+++ 3d-viewer/3d_cache/3d_cache.cpp 2018-09-18 11:02:07.410240387 +0200
|
||
|
|
@@ -2,6 +2,7 @@
|
||
|
|
* This program source code file is part of KiCad, a free EDA CAD application.
|
||
|
|
*
|
||
|
|
* Copyright (C) 2015-2016 Cirilo Bernardo <cirilo.bernardo@gmail.com>
|
||
|
|
+ * Copyright (C) 2018 KiCad Developers, see AUTHORS.txt for contributors.
|
||
|
|
*
|
||
|
|
* This program is free software; you can redistribute it and/or
|
||
|
|
* modify it under the terms of the GNU General Public License
|
||
|
|
@@ -34,7 +35,12 @@
|
||
|
|
#include <wx/log.h>
|
||
|
|
#include <wx/stdpaths.h>
|
||
|
|
|
||
|
|
+#include <boost/version.hpp>
|
||
|
|
+#if BOOST_VERSION >= 106800
|
||
|
|
+#include <boost/uuid/detail/sha1.hpp>
|
||
|
|
+#else
|
||
|
|
#include <boost/uuid/sha1.hpp>
|
||
|
|
+#endif
|
||
|
|
|
||
|
|
#include <glm/glm.hpp>
|
||
|
|
#include <glm/ext.hpp>
|