Never use the system's sha2 library - ours has a different API now. Fixes #4217

This commit is contained in:
David Sansome 2014-02-28 19:48:41 +11:00
parent ee131f07d5
commit b14d2f3123
1 changed files with 4 additions and 8 deletions

View File

@ -365,14 +365,10 @@ if(GMOCK_INCLUDE_DIRS)
endif(GTEST_INCLUDE_DIRS)
endif(GMOCK_INCLUDE_DIRS)
# Use system sha2 if it's available
find_path(SHA2_INCLUDE_DIRS sha2.h)
find_library(SHA2_LIBRARIES sha2)
if(NOT SHA2_INCLUDE_DIRS OR NOT SHA2_LIBRARIES)
add_subdirectory(3rdparty/sha2)
set(SHA2_INCLUDE_DIRS ${CMAKE_CURRENT_SOURCE_DIR}/3rdparty/sha2)
set(SHA2_LIBRARIES sha2)
endif(NOT SHA2_INCLUDE_DIRS OR NOT SHA2_LIBRARIES)
# Never use the system's sha2.
add_subdirectory(3rdparty/sha2)
set(SHA2_INCLUDE_DIRS ${CMAKE_CURRENT_SOURCE_DIR}/3rdparty/sha2)
set(SHA2_LIBRARIES sha2)
# Use our 3rdparty chromaprint if a system one wasn't found
if(NOT CHROMAPRINT_FOUND)