mirror of
https://github.com/tomahawk-player/tomahawk.git
synced 2025-04-21 08:21:54 +02:00
Find libechonest wherever it may be, or at least smarter than before
This commit is contained in:
parent
1c074f52b9
commit
0718be3848
@ -15,6 +15,7 @@ ENDIF()
|
||||
|
||||
FIND_PACKAGE( Taglib 1.6.0 REQUIRED )
|
||||
FIND_PACKAGE( LibLastFm REQUIRED )
|
||||
FIND_PACKAGE( LibEchonest REQUIRED )
|
||||
|
||||
IF( UNIX AND NOT APPLE )
|
||||
ADD_SUBDIRECTORY( alsa-playback )
|
||||
|
42
CMakeModules/FindLibEchonest.cmake
Normal file
42
CMakeModules/FindLibEchonest.cmake
Normal file
@ -0,0 +1,42 @@
|
||||
# - Find libechonest
|
||||
# Find the libechonest includes and the libechonest libraries
|
||||
# This module defines
|
||||
# LIBECHONEST_INCLUDE_DIR, root echonest include dir. Include echonest includes with echonest/foo.h
|
||||
# LIBECHONEST_LIBRARY, the path to libechonest
|
||||
# LIBECHONEST_FOUND, whether libechonest was found
|
||||
|
||||
|
||||
find_path(LIBECHONEST_INCLUDE_DIR NAMES echonest_export.h
|
||||
HINTS
|
||||
~/usr/include
|
||||
/opt/local/include
|
||||
/usr/include
|
||||
/usr/local/include
|
||||
/opt/kde4/include
|
||||
${KDE4_INCLUDE_DIR}
|
||||
PATH_SUFFIXES echonest
|
||||
)
|
||||
|
||||
find_library( LIBECHONEST_LIBRARY NAMES echonest
|
||||
PATHS
|
||||
~/usr/lib
|
||||
/opt/local/lib
|
||||
/usr/lib
|
||||
/usr/lib64
|
||||
/usr/local/lib
|
||||
/opt/kde4/lib
|
||||
${KDE4_LIB_DIR}
|
||||
)
|
||||
|
||||
|
||||
if(LIBECHONEST_INCLUDE_DIR AND LIBECHONEST_LIBRARY)
|
||||
set(LIBECHONEST_FOUND TRUE)
|
||||
message(STATUS "Found libechonest: ${LIBECHONEST_INCLUDE_DIR}, ${LIBECHONEST_LIBRARY}")
|
||||
else(LIBECHONEST_INCLUDE_DIR AND LIBECHONEST_LIBRARY)
|
||||
set(LIBECHONEST_FOUND FALSE)
|
||||
if (LIBECHONEST_FIND_REQUIRED)
|
||||
message(FATAL_ERROR "Could NOT find required package libechonest")
|
||||
endif(LIBECHONEST_FIND_REQUIRED)
|
||||
endif(LIBECHONEST_INCLUDE_DIR AND LIBECHONEST_LIBRARY)
|
||||
|
||||
mark_as_advanced(LIBECHONEST_INCLUDE_DIR LIBECHONEST_LIBRARY)
|
@ -307,9 +307,10 @@ INCLUDE_DIRECTORIES(
|
||||
|
||||
/usr/include/taglib
|
||||
/usr/local/include/taglib
|
||||
/usr/include/echonest
|
||||
/usr/local/include/echonest
|
||||
/usr/local/include
|
||||
|
||||
${LIBECHONEST_INCLUDE_DIR}
|
||||
${LIBECHONEST_INCLUDE_DIR}/..
|
||||
)
|
||||
|
||||
SET( OS_SPECIFIC_LINK_LIBRARIES "" )
|
||||
@ -357,7 +358,7 @@ TARGET_LINK_LIBRARIES( tomahawk
|
||||
${MAC_EXTRA_LIBS}
|
||||
portfwd
|
||||
${OS_SPECIFIC_LINK_LIBRARIES}
|
||||
echonest
|
||||
${LIBECHONEST_LIBRARY}
|
||||
qjson
|
||||
tag
|
||||
)
|
||||
|
Loading…
x
Reference in New Issue
Block a user