iiiypuk/cantata
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Fix cantata-tags for windows

Browse Source
This commit is contained in:
craig.p.drummond
2013-10-22 20:21:43 +00:00
committed by craig.p.drummond
parent 5343b1273a
commit 3b7dfa470a
2 changed files with 5 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
tags/CMakeLists.txt
View File

@@ -1,6 +1,5 @@
include_directories(${QTINCLUDES})
include_directories(${CMAKE_SOURCE_DIR}/tags)
set(CANTATA_TAGS_SRCS ${CANTATA_TAGS_SRCS} main.cpp tagserver.cpp tags.cpp filetyperesolver.cpp ../mpd/song.cpp)
include_directories(${QTINCLUDES} ${TAGLIB_INCLUDES} ${CMAKE_SOURCE_DIR}/tags)
set(CANTATA_TAGS_SRCS main.cpp tagserver.cpp tags.cpp filetyperesolver.cpp ../mpd/song.cpp)
set(CANTATA_TAGS_MOC_HDRS tagserver.h)
if (ENABLE_KDE_SUPPORT)
@@ -10,13 +9,12 @@ else (ENABLE_KDE_SUPPORT)
if (ENABLE_QT5)
QT5_WRAP_CPP(CANTATA_TAGS_MOC_SRCS ${CANTATA_TAGS_MOC_HDRS})
else (ENABLE_QT5)
INCLUDE(${QT_USE_FILE})
QT4_WRAP_CPP(CANTATA_TAGS_MOC_SRCS ${CANTATA_TAGS_MOC_HDRS})
endif (ENABLE_QT5)
if (WIN32)
set(CMAKE_BUILD_TYPE "Release")
ADD_EXECUTABLE(cantata-tags WIN32 ${CANTATA_TAGS_SRCS} ${CANTATA_TAGS_MOC_SRCS}})
ADD_EXECUTABLE(cantata-tags WIN32 ${CANTATA_TAGS_SRCS} ${CANTATA_TAGS_MOC_SRCS})
install(TARGETS cantata-tags DESTINATION ${CMAKE_INSTALL_PREFIX})
else (WIN32)
ADD_EXECUTABLE(cantata-tags ${CANTATA_TAGS_SRCS} ${CANTATA_TAGS_MOC_SRCS})
@@ -25,14 +23,9 @@ else (ENABLE_KDE_SUPPORT)
endif (ENABLE_KDE_SUPPORT)
add_definitions(-DCANTATA_NO_SONG_TIME_FUNCTION)
include_directories(${TAGLIB_INCLUDES})
target_link_libraries(cantata-tags ${TAGLIB_LIBRARIES} ${QTCORELIBS} ${QTNETWORKLIBS})
if (TAGLIB-EXTRAS_FOUND)
target_link_libraries(cantata-tags ${TAGLIB-EXTRAS_LIBRARIES})
include_directories(${TAGLIB-EXTRAS_INCLUDES})
endif (TAGLIB-EXTRAS_FOUND)

3
tags/tagclient.cpp
View File

@@ -35,6 +35,7 @@ K_GLOBAL_STATIC(TagClient, instance)
#include <QLocalServer>
#include <QLocalSocket>
#include <QEventLoop>
#include <QApplication>
#endif
#include <QDebug>
@@ -332,7 +333,7 @@ void TagClient::stopHelper()
socket=0;
if (p) {
disconnect(p, SIGNAL(error(QProcess::ProcessError)), this, SLOT(processError(QProcess::ProcessError)));
p->terminate();
p->kill();
p->deleteLater();
}
if (s) {