From cff60b59393a2eb999f60f2a3e701b0ca1f8a466 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Adrien=20B=C3=A9raud?= <adrien.beraud@savoirfairelinux.com>
Date: Sun, 23 Jul 2017 10:56:02 -0400
Subject: [PATCH] contrib: fix cryptopp Android patch on macOS
Change-Id: I68fe358486ca4e023057bf625f7de63c887a4bb6
---
contrib/src/cryptopp/cmake-crosscompile.patch | 9 ++++-----
1 file changed, 4 insertions(+), 5 deletions(-)
diff --git a/contrib/src/cryptopp/cmake-crosscompile.patch b/contrib/src/cryptopp/cmake-crosscompile.patch
index 0b2b5f2b4a..392dc810de 100644
--- a/contrib/src/cryptopp/cmake-crosscompile.patch
+++ b/contrib/src/cryptopp/cmake-crosscompile.patch
@@ -1,10 +1,9 @@
---- a/CMakeLists.txt
-+++ b/CMakeLists.txt.patched
-@@ -39,12 +39,7 @@ set(CRYPTOPP_DATA_DIR "" CACHE PATH "Crypto++ test data directory")
- # Always 1 ahead in Master. Also see http://groups.google.com/forum/#!topic/cryptopp-users/SFhqLDTQPG4
+--- a/CMakeLists.txt 2016-09-21 02:41:26.000000000 -0400
++++ b/CMakeLists.txt 2017-07-23 09:54:00.000000000 -0400
+@@ -40,11 +40,7 @@
set(LIB_VER ${cryptopp_VERSION_MAJOR}${cryptopp_VERSION_MINOR}${cryptopp_VERSION_PATCH})
--# Only set when cross-compiling, http://www.vtk.org/Wiki/CMake_Cross_Compiling
+ # Only set when cross-compiling, http://www.vtk.org/Wiki/CMake_Cross_Compiling
-if (NOT (CMAKE_SYSTEM_VERSION AND CMAKE_SYSTEM_PROCESSOR))
- set(CRYPTOPP_CROSS_COMPILE 1)
-else()
--
GitLab