From ba2b792916013b0833c064f6b0fccf769f539018 Mon Sep 17 00:00:00 2001
From: Mikhail Titov <mlt@gmx.us>
Date: Wed, 10 Jun 2015 01:12:43 -0500
Subject: [PATCH] Cleanup cryptopp headers path search

---
 build/CMakeLists.txt                   |  2 +-
 build/cmake_modules/FindCryptoPP.cmake | 13 +++++--------
 2 files changed, 6 insertions(+), 9 deletions(-)

diff --git a/build/CMakeLists.txt b/build/CMakeLists.txt
index 19509a74..4e125d58 100644
--- a/build/CMakeLists.txt
+++ b/build/CMakeLists.txt
@@ -195,7 +195,7 @@ if (NOT ${MINIUPNPC_FOUND})
 endif()
 
 # load includes
-include_directories( ${Boost_INCLUDE_DIRS} ${CRYPTO++_INCLUDE_DIR} "${CMAKE_SOURCE_DIR}/..")
+include_directories( ${Boost_INCLUDE_DIRS} ${CRYPTO++_INCLUDE_DIR} )
 
 # show summary
 message(STATUS "---------------------------------------")
diff --git a/build/cmake_modules/FindCryptoPP.cmake b/build/cmake_modules/FindCryptoPP.cmake
index 09b72184..396be144 100644
--- a/build/cmake_modules/FindCryptoPP.cmake
+++ b/build/cmake_modules/FindCryptoPP.cmake
@@ -4,17 +4,14 @@ if(CRYPTO++_INCLUDE_DIR AND CRYPTO++_LIBRARIES)
    set(CRYPTO++_FOUND TRUE)
 
 else(CRYPTO++_INCLUDE_DIR AND CRYPTO++_LIBRARIES)
-  find_path(CRYPTO++_INCLUDE_DIR cryptlib.h
-      /usr/include/crypto++
-      /usr/include/cryptopp
-      /usr/local/include/crypto++
-      /usr/local/include/cryptopp
-      /opt/local/include/crypto++
-      /opt/local/include/cryptopp
+  find_path(CRYPTO++_INCLUDE_DIR cryptopp/cryptlib.h
+      /usr/include
+      /usr/local/include
       $ENV{SystemDrive}/Crypto++/include
       $ENV{CRYPTOPP}
+      $ENV{CRYPTOPP}/..
       $ENV{CRYPTOPP}/include
-      ${PROJECT_SOURCE_DIR}/../../cryptopp
+      ${PROJECT_SOURCE_DIR}/../..
       )
 
   find_library(CRYPTO++_LIBRARIES NAMES cryptopp