1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
52
53
54
55
56
57
58
59
60
61
62
63
64
65
66
67
68
69
70
71
72
73
74
75
76
77
78
79
80
81
82
83
84
85
86
87
88
89
90
91
92
93
94
95
96
97
98
99
100
101
102
103
104
105
106
107
108
109
110
111
112
113
114
115
116
117
118
119
120
121
122
123
124
125
126
127
128
129
130
131
132
133
134
135
136
137
138
139
140
141
142
143
144
145
146
147
148
149
150
151
152
153
154
155
156
157
158
159
|
Description: Use system libmpd instead of bundled one
Author: Andrey Rahmatullin <wrar@debian.org>
Last-Update: 2016-05-21
diff --git a/CMakeLists.txt b/CMakeLists.txt
index b65c2c9..5c0a232 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -1,6 +1,8 @@
cmake_minimum_required(VERSION 2.6)
find_package(Qt4 4.4.0 COMPONENTS QtCore QtGui QtNetwork QtXml QtXmlPatterns REQUIRED QtDBus)
+include(FindPkgConfig)
+pkg_check_modules(LIBMPD libmpd REQUIRED)
if(UNIX)
if(NOT MAC)
find_package(X11 REQUIRED)
@@ -50,7 +52,6 @@ set(QMPDClient_srcs
src/idealbar.cpp
src/idealsplitter.cpp
src/lastfmsubmitter.cpp
- src/libmpdclient.c
src/librarypanel.cpp
src/lineedit.cpp
src/lyricsdialog.cpp
@@ -134,7 +135,6 @@ set(QMPDClient_hdrs
src/idealbar.h
src/idealsplitter.h
src/lastfmsubmitter.h
- src/libmpdclient.h
src/librarypanel.h
src/lineedit.h
src/lyricsdialog.h
@@ -296,6 +296,8 @@ if(WIN32)
target_link_libraries(qmpdclient ws2_32)
set_target_properties(qmpdclient PROPERTIES WIN32_EXECUTABLE TRUE)
endif()
+target_include_directories(qmpdclient PRIVATE ${LIBMPD_INCLUDE_DIRS})
+target_link_libraries(qmpdclient ${LIBMPD_LIBRARIES})
if(UNIX)
install(TARGETS qmpdclient DESTINATION bin)
diff --git a/src/libmpdclient.c b/src/libmpdclient.c
index 567d4bc..47eb6e5 100644
--- a/src/libmpdclient.c
+++ b/src/libmpdclient.c
@@ -35,7 +35,7 @@
# define _CRT_NONSTDC_NO_DEPRECATE 1
#endif
-#include "libmpdclient.h"
+#include <libmpd/libmpd.h>
#include <errno.h>
#include <ctype.h>
diff --git a/src/mpd.cpp b/src/mpd.cpp
index b036149..89a566e 100644
--- a/src/mpd.cpp
+++ b/src/mpd.cpp
@@ -17,7 +17,7 @@
* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
*/
-#include "libmpdclient.h"
+#include <libmpd/libmpd.h>
#include "mpd.h"
#include "mpd_p.h"
#include <QTimer>
diff --git a/src/mpd_p.h b/src/mpd_p.h
index 27876ee..62d0fa2 100644
--- a/src/mpd_p.h
+++ b/src/mpd_p.h
@@ -17,7 +17,7 @@
* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
*/
-#include "libmpdclient.h"
+#include <libmpd/libmpd.h>
#include "mpd.h"
#include "mpdcache.h"
#include "mpdconnection.h"
diff --git a/src/mpdcache.cpp b/src/mpdcache.cpp
index 90f6a3b..4ce606c 100644
--- a/src/mpdcache.cpp
+++ b/src/mpdcache.cpp
@@ -21,7 +21,7 @@
#include "aafilter.h"
#include "config.h"
#include "debug.h"
-#include "libmpdclient.h"
+#include <libmpd/libmpd.h>
#include "mpdconnection.h"
#include "mpddirectory.h"
#include "mpdentities.h"
diff --git a/src/mpdconnection.cpp b/src/mpdconnection.cpp
index 8d61d2d..c679a79 100644
--- a/src/mpdconnection.cpp
+++ b/src/mpdconnection.cpp
@@ -18,7 +18,7 @@
*/
#include "config.h"
-#include "libmpdclient.h"
+#include <libmpd/libmpd.h>
#include "mpdconnection.h"
#include "mpdentities.h"
#include "mpdoutput.h"
diff --git a/src/mpdoutput.cpp b/src/mpdoutput.cpp
index c686974..58ed00e 100644
--- a/src/mpdoutput.cpp
+++ b/src/mpdoutput.cpp
@@ -17,7 +17,7 @@
* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
*/
-#include "libmpdclient.h"
+#include <libmpd/libmpd.h>
#include "mpdoutput.h"
#include <QString>
diff --git a/src/mpdsong.cpp b/src/mpdsong.cpp
index 2d9cd96..cc6f6a4 100644
--- a/src/mpdsong.cpp
+++ b/src/mpdsong.cpp
@@ -17,7 +17,7 @@
* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
*/
-#include "libmpdclient.h"
+#include <libmpd/libmpd.h>
#include "mpdsong.h"
#include "config.h"
#include "tagguesser.h"
diff --git a/src/mpdstats.cpp b/src/mpdstats.cpp
index 63bb2dc..82266a2 100644
--- a/src/mpdstats.cpp
+++ b/src/mpdstats.cpp
@@ -17,7 +17,7 @@
* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
*/
-#include "libmpdclient.h"
+#include <libmpd/libmpd.h>
#include "mpdstats.h"
#include <QString>
diff --git a/src/mpdstatus.cpp b/src/mpdstatus.cpp
index 2105964..ae9fa4e 100644
--- a/src/mpdstatus.cpp
+++ b/src/mpdstatus.cpp
@@ -17,7 +17,7 @@
* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
*/
-#include "libmpdclient.h"
+#include <libmpd/libmpd.h>
#include "mpdstatus.h"
#include <QString>
|
