Funkwhale/Clementine-audio-player-Mac-Linux-Windows
1
0
Fork 0
mirror of https://github.com/clementine-player/Clementine synced 2025-01-05 14:28:40 +01:00
Code Issues Releases Wiki Activity

Use the system libechonest if it's installed

Browse Source
This commit is contained in:
David Sansome 2010-12-18 18:36:56 +00:00
parent 18a1eb75af
commit a8a035a13a
2 changed files with 10 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
CMakeLists.txt
View File

@ -229,7 +229,15 @@ else (USE_SYSTEM_QXT)
endif (NOT APPLE) endif (NOT APPLE)
endif (USE_SYSTEM_QXT) endif (USE_SYSTEM_QXT)
set(ECHONEST_INCLUDE_DIRS ${CMAKE_BINARY_DIR}/3rdparty/libechonest) # Use system libechonest if it's available
find_path(ECHONEST_INCLUDE_DIRS echonest/echonest_export.h)
find_library(ECHONEST_LIBRARIES echonest)
if(NOT ECHONEST_INCLUDE_DIRS OR NOT ECHONEST_LIBRARIES)
add_subdirectory(3rdparty/libechonest)
set(ECHONEST_INCLUDE_DIRS ${CMAKE_BINARY_DIR}/3rdparty/libechonest)
set(ECHONEST_LIBRARIES echonest)
endif(NOT ECHONEST_INCLUDE_DIRS OR NOT ECHONEST_LIBRARIES)
# Subdirectories # Subdirectories
add_subdirectory(src) add_subdirectory(src)
@ -237,7 +245,6 @@ if (WIN32)
add_subdirectory(3rdparty/qtwin) add_subdirectory(3rdparty/qtwin)
endif (WIN32) endif (WIN32)
add_subdirectory(3rdparty/universalchardet) add_subdirectory(3rdparty/universalchardet)
add_subdirectory(3rdparty/libechonest)
add_subdirectory(tests) add_subdirectory(tests)
add_subdirectory(dist) add_subdirectory(dist)
add_subdirectory(tools/ultimate_lyrics_parser) add_subdirectory(tools/ultimate_lyrics_parser)

2
src/CMakeLists.txt
View File

@ -770,7 +770,7 @@ add_dependencies(clementine_lib pot)
target_link_libraries(clementine_lib target_link_libraries(clementine_lib
chardet chardet
echonest ${ECHONEST_LIBRARIES}
${GOBJECT_LIBRARIES} ${GOBJECT_LIBRARIES}
${GLIB_LIBRARIES} ${GLIB_LIBRARIES}
${TAGLIB_LIBRARIES} ${TAGLIB_LIBRARIES}