mirror/tomahawk
1
0
Fork 0
mirror of https://github.com/tomahawk-player/tomahawk.git synced 2025-08-17 03:24:15 +02:00
Code Issues Releases Wiki Activity

Make linking on linux as strict as it is on mac

Browse Source 
Link to pthreads too
This commit is contained in:
Leo Franchi
2011-03-11 13:34:11 -05:00
parent 79af8f35b5
commit 8997c666b7
2 changed files with 6 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
CMakeLists.txt
View File

@@ -44,6 +44,8 @@ macro_log_feature(QJSON_FOUND "QJson" "Qt library that maps JSON data to QVarian
macro_optional_find_package(Taglib 1.6.0) macro_optional_find_package(Taglib 1.6.0)
macro_log_feature(TAGLIB_FOUND "TagLib" "Audio Meta-Data Library" "http://developer.kde.org/~wheeler/taglib.html" TRUE "" "taglib is needed for reading meta data from audio files") macro_log_feature(TAGLIB_FOUND "TagLib" "Audio Meta-Data Library" "http://developer.kde.org/~wheeler/taglib.html" TRUE "" "taglib is needed for reading meta data from audio files")
# we need pthreads too
find_package(Threads)
FIND_PACKAGE( Taglib 1.6.0 REQUIRED ) FIND_PACKAGE( Taglib 1.6.0 REQUIRED )
include( CheckTagLibFileName ) include( CheckTagLibFileName )
@@ -83,6 +85,9 @@ MESSAGE("add checks for libmad, libvorbis and libflac. Make sure they are instal
MESSAGE("") MESSAGE("")
MESSAGE("-----------------------------------------------------------------------------") MESSAGE("-----------------------------------------------------------------------------")
# Make linking as strict on linux as it is on osx. Then we don't break linking on mac so often
SET( CMAKE_CXX_FLAGS "${CMAKE_CXX_LINK_FLAGS} -Wl,--no-undefined" )
ADD_SUBDIRECTORY( thirdparty ) ADD_SUBDIRECTORY( thirdparty )
ADD_SUBDIRECTORY( src/libtomahawk ) ADD_SUBDIRECTORY( src/libtomahawk )
ADD_SUBDIRECTORY( src ) ADD_SUBDIRECTORY( src )

1
src/libtomahawk/CMakeLists.txt
View File

@@ -398,6 +398,7 @@ target_link_libraries( tomahawklib
${LIBECHONEST_LIBRARY} ${LIBECHONEST_LIBRARY}
${QT_LIBRARIES} ${QT_LIBRARIES}
${OS_SPECIFIC_LINK_LIBRARIES} ${OS_SPECIFIC_LINK_LIBRARIES}
${CMAKE_THREAD_LIBS_INIT}
) )
install( TARGETS tomahawklib DESTINATION lib ) install( TARGETS tomahawklib DESTINATION lib )