Funkwhale/Clementine-audio-player-Mac-Linux-Windows
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Use SHA2 system library when available

Browse Source 
Fixes issue 2623
This commit is contained in:
Orcan Ogetbil 2012-01-17 23:01:01 +01:00 committed by Arnaud Bienner
parent fdf10af94a
commit 9dd4b1bb94
2 changed files with 11 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
CMakeLists.txt
View File

@ -356,6 +356,15 @@ if(GMOCK_INCLUDE_DIRS)
endif(GTEST_INCLUDE_DIRS) endif(GTEST_INCLUDE_DIRS)
endif(GMOCK_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 # Use our 3rdparty chromaprint if a system one wasn't found
if(NOT CHROMAPRINT_FOUND) if(NOT CHROMAPRINT_FOUND)
add_subdirectory(3rdparty/chromaprint) add_subdirectory(3rdparty/chromaprint)
@ -372,7 +381,6 @@ add_subdirectory(src)
if (WIN32) if (WIN32)
add_subdirectory(3rdparty/qtwin) add_subdirectory(3rdparty/qtwin)
endif (WIN32) endif (WIN32)
add_subdirectory(3rdparty/sha2)
add_subdirectory(3rdparty/universalchardet) add_subdirectory(3rdparty/universalchardet)
add_subdirectory(tests) add_subdirectory(tests)
add_subdirectory(dist) add_subdirectory(dist)

4
src/CMakeLists.txt
View File

@ -12,7 +12,6 @@ endif(BUILD_WERROR)
include_directories(${CMAKE_SOURCE_DIR} ${CMAKE_CURRENT_BINARY_DIR} ${CMAKE_CURRENT_SOURCE_DIR}) include_directories(${CMAKE_SOURCE_DIR} ${CMAKE_CURRENT_BINARY_DIR} ${CMAKE_CURRENT_SOURCE_DIR})
include_directories(../3rdparty/gmock/gtest/include) include_directories(../3rdparty/gmock/gtest/include)
include_directories(../3rdparty/sha2)
if(WIN32) if(WIN32)
include_directories(../3rdparty/qtwin) include_directories(../3rdparty/qtwin)
endif(WIN32) endif(WIN32)
@ -26,6 +25,7 @@ include_directories(${QTSINGLEAPPLICATION_INCLUDE_DIRS})
include_directories(${QTIOCOMPRESSOR_INCLUDE_DIRS}) include_directories(${QTIOCOMPRESSOR_INCLUDE_DIRS})
include_directories(${QXT_INCLUDE_DIRS}) include_directories(${QXT_INCLUDE_DIRS})
include_directories(${ECHONEST_INCLUDE_DIRS}) include_directories(${ECHONEST_INCLUDE_DIRS})
include_directories(${SHA2_INCLUDE_DIRS})
include_directories(${CHROMAPRINT_INCLUDE_DIRS}) include_directories(${CHROMAPRINT_INCLUDE_DIRS})
find_package(OpenGL) find_package(OpenGL)
@ -970,7 +970,7 @@ add_dependencies(clementine_lib pot)
target_link_libraries(clementine_lib target_link_libraries(clementine_lib
libclementine-common libclementine-common
libclementine-tagreader libclementine-tagreader
sha2 ${SHA2_LIBRARIES}
${TAGLIB_LIBRARIES} ${TAGLIB_LIBRARIES}
${CHROMAPRINT_LIBRARIES} ${CHROMAPRINT_LIBRARIES}
${ECHONEST_LIBRARIES} ${ECHONEST_LIBRARIES}