mirror of
https://github.com/tomahawk-player/tomahawk.git
synced 2025-04-08 10:02:29 +02:00
Merge branch 'master' into accounts
This commit is contained in:
Jeff Mitchell
commit
8e2721236f
3
.gitmodules
vendored
3
.gitmodules
vendored
@ -1,6 +1,3 @@
|
||||
[submodule "thirdparty/jreen"]
|
||||
path = thirdparty/jreen
|
||||
url = git://github.com/euroelessar/jreen.git
|
||||
[submodule "thirdparty/qtweetlib/QTweetLib"]
|
||||
path = thirdparty/qtweetlib/QTweetLib
|
||||
url = git://github.com/minimoog/QTweetLib.git
|
||||
|
||||
@ -130,7 +130,7 @@ set(LIBLASTFM_FOUND true)
|
||||
#### submodules start
|
||||
|
||||
# this installs headers and such and should really be handled in a separate package by packagers
|
||||
IF( INTERNAL_JREEN OR INTERNAL_QTWEETLIB )
|
||||
IF( INTERNAL_JREEN )
|
||||
IF(EXISTS ${CMAKE_CURRENT_SOURCE_DIR}/.gitmodules)
|
||||
EXECUTE_PROCESS(COMMAND git submodule init WORKING_DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR} )
|
||||
EXECUTE_PROCESS(COMMAND git submodule update WORKING_DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR} )
|
||||
@ -149,19 +149,8 @@ ELSE( INTERNAL_JREEN )
|
||||
ENDIF( INTERNAL_JREEN )
|
||||
macro_log_feature(LIBJREEN_FOUND "Jreen" "Qt XMPP Library" "https://github.com/euroelessar/jreen" FALSE "" "Jreen is needed for the Jabber SIP plugin. \n\n Use -DINTERNAL_JREEN=ON to build the git submodule inside Tomahawk \n Be aware this installs a full jreen with headers and everything!\n")
|
||||
|
||||
IF( INTERNAL_QTWEETLIB )
|
||||
ADD_SUBDIRECTORY( ${THIRDPARTY_DIR}/qtweetlib )
|
||||
# copy headers to build/QTweetLib so we can use proper includes inside the code
|
||||
FILE( COPY ${CMAKE_SOURCE_DIR}/thirdparty/qtweetlib/QTweetLib/src/ DESTINATION ${CMAKE_BINARY_DIR}/QTweetLib )
|
||||
SET( QTWEETLIB_INCLUDE_DIR ${CMAKE_BINARY_DIR} )
|
||||
SET( QTWEETLIB_LIBRARY tomahawk_qtweetlib )
|
||||
SET( QTWEETLIB_LIBRARIES ${QTWEETLIB_LIBRARY} )
|
||||
SET( QTWEETLIB_FOUND true )
|
||||
MESSAGE(STATUS "INTERNAL libQTweetLib: ${QTWEETLIB_INCLUDE_DIR}, ${QTWEETLIB_LIBRARY}")
|
||||
ELSE( INTERNAL_QTWEETLIB )
|
||||
macro_optional_find_package(QTweetLib)
|
||||
ENDIF( INTERNAL_QTWEETLIB )
|
||||
macro_log_feature(QTWEETLIB_FOUND "QTweetLib" "Qt Twitter Library" "https://github.com/minimoog/QTweetLib" FALSE "" "QTweetLib is needed for the Twitter SIP plugin. \n\n Use -DINTERNAL_QTWEETLIB=ON to build the git submodule inside Tomahawk \n")
|
||||
macro_optional_find_package(QTweetLib)
|
||||
macro_log_feature(QTWEETLIB_FOUND "QTweetLib" "Qt Twitter Library" "https://github.com/minimoog/QTweetLib" FALSE "" "QTweetLib is needed for the Twitter SIP plugin.\n")
|
||||
#### submodules end
|
||||
|
||||
### libportfwd
|
||||
|
||||
2
README
2
README
@ -40,7 +40,7 @@ Dependencies
|
||||
|
||||
Attica 0.2.0 - ftp://ftp.kde.org/pub/kde/stable/attica/
|
||||
jreen (Git) - https://github.com/euroelessar/jreen
|
||||
QTweetLib (Git) - https://github.com/minimoog/QTweetLib
|
||||
QTweetLib 0.3.0 - https://github.com/minimoog/QTweetLib
|
||||
|
||||
Third party libraries that we ship with our source:
|
||||
|
||||
|
||||
181
thirdparty/qtweetlib/CMakeLists.txt
vendored
181
thirdparty/qtweetlib/CMakeLists.txt
vendored
@ -1,181 +0,0 @@
|
||||
PROJECT(QTweetLib)
|
||||
|
||||
CMAKE_MINIMUM_REQUIRED(VERSION 2.6 FATAL_ERROR)
|
||||
SET(CMAKE_VERBOSE_MAKEFILE ON)
|
||||
|
||||
SET( QT_USE_QTNETWORK TRUE )
|
||||
INCLUDE( ${QT_USE_FILE} )
|
||||
|
||||
|
||||
add_definitions( ${QT_DEFINITIONS} )
|
||||
add_definitions( -DQT_SHARED )
|
||||
add_definitions( -DQTWEETLIB_MAKEDLL )
|
||||
|
||||
if(WIN32)
|
||||
set(PLATFORM_SPECIFIC_LIBS "ws2_32.dll" "advapi32.dll" )
|
||||
endif(WIN32)
|
||||
|
||||
set(TOMAHAWK_QTWEETLIB_SOURCES
|
||||
QTweetLib/src/oauth.cpp
|
||||
QTweetLib/src/oauthtwitter.cpp
|
||||
QTweetLib/src/qtweetfriendstimeline.cpp
|
||||
QTweetLib/src/qtweethometimeline.cpp
|
||||
QTweetLib/src/qtweetmentions.cpp
|
||||
QTweetLib/src/qtweetnetbase.cpp
|
||||
QTweetLib/src/qtweetretweetbyme.cpp
|
||||
QTweetLib/src/qtweetretweetsofme.cpp
|
||||
QTweetLib/src/qtweetretweettome.cpp
|
||||
QTweetLib/src/qtweetstatus.cpp
|
||||
QTweetLib/src/qtweetstatusshow.cpp
|
||||
QTweetLib/src/qtweetstatusupdate.cpp
|
||||
QTweetLib/src/qtweetuser.cpp
|
||||
QTweetLib/src/qtweetusertimeline.cpp
|
||||
QTweetLib/src/qtweetstatusdestroy.cpp
|
||||
QTweetLib/src/qtweetstatusretweet.cpp
|
||||
QTweetLib/src/qtweetstatusretweets.cpp
|
||||
QTweetLib/src/qtweetusershow.cpp
|
||||
QTweetLib/src/qtweetuserlookup.cpp
|
||||
QTweetLib/src/qtweetdirectmessages.cpp
|
||||
QTweetLib/src/qtweetuserstream.cpp
|
||||
QTweetLib/src/qtweetdmstatus.cpp
|
||||
QTweetLib/src/qtweetusersearch.cpp
|
||||
QTweetLib/src/qtweetuserstatusesfriends.cpp
|
||||
QTweetLib/src/qtweetuserstatusesfollowers.cpp
|
||||
QTweetLib/src/qtweetlist.cpp
|
||||
QTweetLib/src/qtweetlistcreate.cpp
|
||||
QTweetLib/src/qtweetlistupdate.cpp
|
||||
QTweetLib/src/qtweetlistgetlists.cpp
|
||||
QTweetLib/src/qtweetlistshowlist.cpp
|
||||
QTweetLib/src/qtweetlistdeletelist.cpp
|
||||
QTweetLib/src/qtweetliststatuses.cpp
|
||||
QTweetLib/src/qtweetlistmemberships.cpp
|
||||
QTweetLib/src/qtweetlistsubscriptions.cpp
|
||||
QTweetLib/src/qtweetlistgetmembers.cpp
|
||||
QTweetLib/src/qtweetlistaddmember.cpp
|
||||
QTweetLib/src/qtweetlistdeletemember.cpp
|
||||
QTweetLib/src/qtweetlistsubscribers.cpp
|
||||
QTweetLib/src/qtweetlistsubscribe.cpp
|
||||
QTweetLib/src/qtweetlistunsubscribe.cpp
|
||||
QTweetLib/src/qtweetdirectmessagessent.cpp
|
||||
QTweetLib/src/qtweetdirectmessagenew.cpp
|
||||
QTweetLib/src/qtweetdirectmessagedestroy.cpp
|
||||
QTweetLib/src/qtweetfriendshipcreate.cpp
|
||||
QTweetLib/src/qtweetfriendshipdestroy.cpp
|
||||
QTweetLib/src/qtweetfriendsid.cpp
|
||||
QTweetLib/src/qtweetfollowersid.cpp
|
||||
QTweetLib/src/qtweetaccountverifycredentials.cpp
|
||||
QTweetLib/src/qtweetaccountratelimitstatus.cpp
|
||||
QTweetLib/src/qtweetfavorites.cpp
|
||||
QTweetLib/src/qtweetfavoritescreate.cpp
|
||||
QTweetLib/src/qtweetfavoritesdestroy.cpp
|
||||
QTweetLib/src/qtweetsearch.cpp
|
||||
QTweetLib/src/qtweetsearchresult.cpp
|
||||
QTweetLib/src/qtweetsearchpageresults.cpp
|
||||
QTweetLib/src/qtweetplace.cpp
|
||||
QTweetLib/src/qtweetgeoreversegeocode.cpp
|
||||
QTweetLib/src/qtweetgeosearch.cpp
|
||||
QTweetLib/src/qtweetgeosimilarplaces.cpp
|
||||
QTweetLib/src/qtweetgeoplaceid.cpp
|
||||
QTweetLib/src/qtweetgeoplacecreate.cpp
|
||||
QTweetLib/src/qtweetgeocoord.cpp
|
||||
QTweetLib/src/qtweetgeoboundingbox.cpp
|
||||
QTweetLib/src/qtweetconvert.cpp
|
||||
QTweetLib/src/qtweetentityurl.cpp
|
||||
QTweetLib/src/qtweetentityhashtag.cpp
|
||||
QTweetLib/src/qtweetentityusermentions.cpp
|
||||
QTweetLib/src/qtweetblocksblocking.cpp
|
||||
QTweetLib/src/qtweetblocksblockingids.cpp
|
||||
QTweetLib/src/qtweetblockscreate.cpp
|
||||
QTweetLib/src/qtweetblocksdestroy.cpp
|
||||
QTweetLib/src/qtweetblocksexists.cpp
|
||||
)
|
||||
|
||||
set(TOMAHAWK_QTWEETLIB_HEADERS
|
||||
QTweetLib/src/oauth.h
|
||||
QTweetLib/src/oauthtwitter.h
|
||||
QTweetLib/src/qtweetfriendstimeline.h
|
||||
QTweetLib/src/qtweethometimeline.h
|
||||
QTweetLib/src/qtweetmentions.h
|
||||
QTweetLib/src/qtweetnetbase.h
|
||||
QTweetLib/src/qtweetretweetbyme.h
|
||||
QTweetLib/src/qtweetretweetsofme.h
|
||||
QTweetLib/src/qtweetretweettome.h
|
||||
QTweetLib/src/qtweetstatusshow.h
|
||||
QTweetLib/src/qtweetstatusupdate.h
|
||||
QTweetLib/src/qtweetusertimeline.h
|
||||
QTweetLib/src/qtweetstatusdestroy.h
|
||||
QTweetLib/src/qtweetstatusretweet.h
|
||||
QTweetLib/src/qtweetstatusretweets.h
|
||||
QTweetLib/src/qtweetusershow.h
|
||||
QTweetLib/src/qtweetuserlookup.h
|
||||
QTweetLib/src/qtweetdirectmessages.h
|
||||
QTweetLib/src/qtweetuserstream.h
|
||||
QTweetLib/src/qtweetusersearch.h
|
||||
QTweetLib/src/qtweetuserstatusesfriends.h
|
||||
QTweetLib/src/qtweetuserstatusesfollowers.h
|
||||
QTweetLib/src/qtweetlistcreate.h
|
||||
QTweetLib/src/qtweetlistupdate.h
|
||||
QTweetLib/src/qtweetlistgetlists.h
|
||||
QTweetLib/src/qtweetlistshowlist.h
|
||||
QTweetLib/src/qtweetlistdeletelist.h
|
||||
QTweetLib/src/qtweetliststatuses.h
|
||||
QTweetLib/src/qtweetlistmemberships.h
|
||||
QTweetLib/src/qtweetlistsubscriptions.h
|
||||
QTweetLib/src/qtweetlistgetmembers.h
|
||||
QTweetLib/src/qtweetlistaddmember.h
|
||||
QTweetLib/src/qtweetlistdeletemember.h
|
||||
QTweetLib/src/qtweetlistsubscribers.h
|
||||
QTweetLib/src/qtweetlistsubscribe.h
|
||||
QTweetLib/src/qtweetlistunsubscribe.h
|
||||
QTweetLib/src/qtweetdirectmessagessent.h
|
||||
QTweetLib/src/qtweetdirectmessagenew.h
|
||||
QTweetLib/src/qtweetdirectmessagedestroy.h
|
||||
QTweetLib/src/qtweetfriendshipcreate.h
|
||||
QTweetLib/src/qtweetfriendshipdestroy.h
|
||||
QTweetLib/src/qtweetfriendsid.h
|
||||
QTweetLib/src/qtweetfollowersid.h
|
||||
QTweetLib/src/qtweetaccountverifycredentials.h
|
||||
QTweetLib/src/qtweetaccountratelimitstatus.h
|
||||
QTweetLib/src/qtweetfavorites.h
|
||||
QTweetLib/src/qtweetfavoritescreate.h
|
||||
QTweetLib/src/qtweetfavoritesdestroy.h
|
||||
QTweetLib/src/qtweetsearch.h
|
||||
QTweetLib/src/qtweetgeoreversegeocode.h
|
||||
QTweetLib/src/qtweetgeosearch.h
|
||||
QTweetLib/src/qtweetgeosimilarplaces.h
|
||||
QTweetLib/src/qtweetgeoplaceid.h
|
||||
QTweetLib/src/qtweetgeoplacecreate.h
|
||||
QTweetLib/src/qtweetblocksblocking.h
|
||||
QTweetLib/src/qtweetblocksblockingids.h
|
||||
QTweetLib/src/qtweetblockscreate.h
|
||||
QTweetLib/src/qtweetblocksdestroy.h
|
||||
QTweetLib/src/qtweetblocksexists.h
|
||||
)
|
||||
|
||||
include_directories(
|
||||
.
|
||||
${QT_INCLUDE_DIR}
|
||||
${QT_INCLUDES}
|
||||
${QJSON_INCLUDE_DIR}
|
||||
QTweetLib/src
|
||||
)
|
||||
|
||||
qt4_wrap_cpp( TOMAHAWK_QTWEETLIB_MOC ${TOMAHAWK_QTWEETLIB_HEADERS} )
|
||||
|
||||
ADD_LIBRARY(tomahawk_qtweetlib SHARED ${TOMAHAWK_QTWEETLIB_SOURCES} ${TOMAHAWK_QTWEETLIB_MOC})
|
||||
|
||||
if(APPLE)
|
||||
SET(QJSON_FLAGS ${QJSON_LIBRARIES})
|
||||
else(APPLE)
|
||||
SET(QJSON_FLAGS ${QJSON_LDFLAGS})
|
||||
endif(APPLE)
|
||||
|
||||
target_link_libraries(tomahawk_qtweetlib
|
||||
${QT_LIBRARIES}
|
||||
${QJSON_FLAGS}
|
||||
${QJSON_LIBRARIES}
|
||||
)
|
||||
|
||||
INSTALL(TARGETS tomahawk_qtweetlib DESTINATION lib${LIB_SUFFIX})
|
||||
|
||||
|
||||
1
thirdparty/qtweetlib/QTweetLib
vendored
1
thirdparty/qtweetlib/QTweetLib
vendored
@ -1 +0,0 @@
|
||||
Subproject commit cb2c8d65250582b35d7655bae4850e02b13112fe
|
||||
Loading…
x
Reference in New Issue
Block a user