Cleanup cryptopp headers path search

9 years ago · ba2b792916
parent 44768e92ad
commit ba2b792916
2 changed files with 6 additions and 9 deletions
--- 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 "---------------------------------------")
--- 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