diff --git a/CMakeLists.txt b/CMakeLists.txt index ccc80b5dc..079541707 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -356,6 +356,15 @@ 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) + # Use our 3rdparty chromaprint if a system one wasn't found if(NOT CHROMAPRINT_FOUND) add_subdirectory(3rdparty/chromaprint) @@ -372,7 +381,6 @@ add_subdirectory(src) if (WIN32) add_subdirectory(3rdparty/qtwin) endif (WIN32) -add_subdirectory(3rdparty/sha2) add_subdirectory(3rdparty/universalchardet) add_subdirectory(tests) add_subdirectory(dist) diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt index 5bd4095e2..4836159e4 100644 --- a/src/CMakeLists.txt +++ b/src/CMakeLists.txt @@ -12,7 +12,6 @@ endif(BUILD_WERROR) include_directories(${CMAKE_SOURCE_DIR} ${CMAKE_CURRENT_BINARY_DIR} ${CMAKE_CURRENT_SOURCE_DIR}) include_directories(../3rdparty/gmock/gtest/include) -include_directories(../3rdparty/sha2) if(WIN32) include_directories(../3rdparty/qtwin) endif(WIN32) @@ -26,6 +25,7 @@ include_directories(${QTSINGLEAPPLICATION_INCLUDE_DIRS}) include_directories(${QTIOCOMPRESSOR_INCLUDE_DIRS}) include_directories(${QXT_INCLUDE_DIRS}) include_directories(${ECHONEST_INCLUDE_DIRS}) +include_directories(${SHA2_INCLUDE_DIRS}) include_directories(${CHROMAPRINT_INCLUDE_DIRS}) find_package(OpenGL) @@ -970,7 +970,7 @@ add_dependencies(clementine_lib pot) target_link_libraries(clementine_lib libclementine-common libclementine-tagreader - sha2 + ${SHA2_LIBRARIES} ${TAGLIB_LIBRARIES} ${CHROMAPRINT_LIBRARIES} ${ECHONEST_LIBRARIES}