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
160
161
162
163
164
165
166
167
168
169
170
171
172
173
174
175
176
177
178
179
180
181
182
183
184
185
186
187
188
189
190
191
192
193
194
195
196
197
198
199
200
201
202
203
204
205
206
207
208
209
210
211
212
213
214
215
216
217
218
219
220
221
222
223
224
225
226
227
228
229
230
231
232
233
234
235
236
237
238
239
240
241
242
243
244
245
246
247
248
249
250
251
252
253
254
255
256
257
258
259
260
261
262
263
264
265
266
267
268
|
--- cmake/KwaveKDESupport.cmake.orig 2008-07-24 22:22:11.000000000 +0200
+++ cmake/KwaveKDESupport.cmake 2008-07-24 22:23:06.000000000 +0200
@@ -35,112 +35,59 @@
#############################################################################
EXECUTE_PROCESS(
COMMAND
- ${KDECONFIG_EXECUTABLE} --expandvars --install html
- OUTPUT_VARIABLE
- KDE3_HTMLDIR
- OUTPUT_STRIP_TRAILING_WHITESPACE
-)
-
-#############################################################################
-EXECUTE_PROCESS(
- COMMAND
- ${KDECONFIG_EXECUTABLE} --expandvars --install apps
- OUTPUT_VARIABLE
- KDE3_APPSDIR
- OUTPUT_STRIP_TRAILING_WHITESPACE
-)
-
-#############################################################################
-EXECUTE_PROCESS(
- COMMAND
- ${KDECONFIG_EXECUTABLE} --expandvars --install exe
- OUTPUT_VARIABLE
- KDE3_EXEDIR
- OUTPUT_STRIP_TRAILING_WHITESPACE
-)
-
-#############################################################################
-EXECUTE_PROCESS(
- COMMAND
- ${KDECONFIG_EXECUTABLE} --expandvars --install lib
- OUTPUT_VARIABLE
- KDE3_LIBDIR
- OUTPUT_STRIP_TRAILING_WHITESPACE
-)
-
-#############################################################################
-EXECUTE_PROCESS(
- COMMAND
- ${KDECONFIG_EXECUTABLE} --expandvars --install icon
- OUTPUT_VARIABLE
- KDE3_ICONDIR
- OUTPUT_STRIP_TRAILING_WHITESPACE
-)
-
-#############################################################################
-EXECUTE_PROCESS(
- COMMAND
- ${KDECONFIG_EXECUTABLE} --expandvars --install data
+ ${KDECONFIG_EXECUTABLE} --expandvars --prefix
OUTPUT_VARIABLE
- KDE3_DATADIR
+ KDE3_PREFIX
OUTPUT_STRIP_TRAILING_WHITESPACE
)
-#############################################################################
-EXECUTE_PROCESS(
- COMMAND
- ${KDECONFIG_EXECUTABLE} --expandvars --install locale
- OUTPUT_VARIABLE
- KDE3_LOCALEDIR
- OUTPUT_STRIP_TRAILING_WHITESPACE
-)
+IF ( ${CMAKE_INSTALL_PREFIX} STREQUAL "" )
+ SET ( datadir ${KDE3_PREFIX}/share )
+ SET ( exec_prefix ${KDE3_PREFIX} )
+ELSE ( ${CMAKE_INSTALL_PREFIX} STREQUAL "" )
+ SET ( datadir ${CMAKE_INSTALL_PREFIX}/share )
+ SET ( exec_prefix ${CMAKE_INSTALL_PREFIX} )
+ENDIF ( ${CMAKE_INSTALL_PREFIX} STREQUAL "" )
+
+FOREACH (DIR apps config data html icon locale mime xdgdata-apps )
+ EXECUTE_PROCESS(
+ COMMAND
+ ${KDECONFIG_EXECUTABLE} --install "${DIR}"
+ OUTPUT_VARIABLE
+ TEMP
+ OUTPUT_STRIP_TRAILING_WHITESPACE
+ )
+ STRING(TOUPPER "${DIR}" DIR)
+ STRING(REGEX REPLACE "\\$\\{.*\\}" "${datadir}" "KDE3_${DIR}DIR" "${TEMP}")
+ENDFOREACH (DIR)
+
+STRING(REGEX REPLACE "HTML$" "" KDE3_DOCDIR ${KDE3_HTMLDIR})
#############################################################################
-EXECUTE_PROCESS(
- COMMAND
- ${KDECONFIG_EXECUTABLE} --expandvars --install mime
- OUTPUT_VARIABLE
- KDE3_MIMEDIR
- OUTPUT_STRIP_TRAILING_WHITESPACE
-)
-#############################################################################
-EXECUTE_PROCESS(
- COMMAND
- ${KDECONFIG_EXECUTABLE} --expandvars --install module
- OUTPUT_VARIABLE
- KDE3_MODULEDIR
- OUTPUT_STRIP_TRAILING_WHITESPACE
-)
+FOREACH (DIR exe lib)
+ EXECUTE_PROCESS(
+ COMMAND
+ ${KDECONFIG_EXECUTABLE} --install "${DIR}"
+ OUTPUT_VARIABLE
+ TEMP
+ OUTPUT_STRIP_TRAILING_WHITESPACE
+ )
+ STRING(TOUPPER "${DIR}" DIR)
+ STRING(REGEX REPLACE "\\$\\{.*\\}" "${exec_prefix}" "KDE3_${DIR}DIR" "${TEMP}")
+ENDFOREACH (DIR)
-#############################################################################
-EXECUTE_PROCESS(
- COMMAND
- ${KDECONFIG_EXECUTABLE} --expandvars --install config
- OUTPUT_VARIABLE
- KDE3_CONFDIR
- OUTPUT_STRIP_TRAILING_WHITESPACE
-)
+SET ( KDE3_MODULEDIR "${KDE3_LIBDIR}/kde3" )
-
-#############################################################################
EXECUTE_PROCESS(
COMMAND
${KDECONFIG_EXECUTABLE} --expandvars --install html
OUTPUT_VARIABLE
- KDE3_DOCDIR
+ KDE3_HTML_INSTALLDIR
OUTPUT_STRIP_TRAILING_WHITESPACE
)
-STRING(REGEX REPLACE "HTML$" "" KDE3_DOCDIR ${KDE3_DOCDIR})
-#############################################################################
-EXECUTE_PROCESS(
- COMMAND
- ${KDECONFIG_EXECUTABLE} --expandvars --prefix
- OUTPUT_VARIABLE
- KDE3_PREFIX
- OUTPUT_STRIP_TRAILING_WHITESPACE
-)
+FILE(RELATIVE_PATH KDE3_COMMONSYMLINK ${KDE3_HTMLDIR}/lang/app ${KDE3_HTML_INSTALLDIR}/en/common)
#############################################################################
#############################################################################
--- kwave/CMakeLists.txt.orig 2008-07-24 22:20:26.000000000 +0200
+++ kwave/CMakeLists.txt 2008-07-24 22:29:40.000000000 +0200
@@ -137,16 +137,25 @@
#############################################################################
-TARGET_LINK_LIBRARIES(kwave_core
+SET(kwave_LIBRARIES
+ kwave_core
kwave
kwavegui
${QT_AND_KDECORE_LIBS}
kdeui
kio
- artsc
- artsflow
)
+IF (WITH_ARTS)
+ SET(kwave_LIBRARIES
+ ${kwave_LIBRARIES}
+ artsc
+ artsflow
+ )
+ENDIF (WITH_ARTS)
+
+TARGET_LINK_LIBRARIES(${kwave_LIBRARIES})
+
ADD_DEPENDENCIES(kwave_core libkwavegui libkwave)
SET_TARGET_PROPERTIES(kwave_core PROPERTIES OUTPUT_NAME "kwave")
@@ -157,8 +166,16 @@
# the main program
INSTALL(TARGETS kwave_core DESTINATION ${DESTDIR}${KDE3_EXEDIR})
+IF ( "${SHARE_INSTALL_PREFIX}" STREQUAL "" )
+ if ( "${CMAKE_INSTALL_PREFIX}" STREQUAL "" )
+ SET ( SHARE_INSTALL_PREFIX /usr/share )
+ ELSE ( "${CMAKE_INSTALL_PREFIX}" STREQUAL "" )
+ SET ( SHARE_INSTALL_PREFIX "${CMAKE_INSTALL_PREFIX}/share" )
+ ENDIF ( "${CMAKE_INSTALL_PREFIX}" STREQUAL "" )
+ENDIF ( "${SHARE_INSTALL_PREFIX}" STREQUAL "" )
+
# other files
-INSTALL(FILES kwave.desktop DESTINATION ${KDE3_APPSDIR}/Multimedia)
+INSTALL(FILES kwave.desktop DESTINATION ${KDE3_XDGDATA-APPSDIR})
INSTALL(FILES menus.config DESTINATION ${KDE3_DATADIR}/kwave)
INSTALL(FILES ${kwave_PIXMAPS} DESTINATION ${KDE3_DATADIR}/kwave/pics)
INSTALL(FILES x-aifc.desktop x-ircam.desktop DESTINATION ${KDE3_MIMEDIR}/audio)
--- libkwave/CMakeLists.txt.orig 2008-07-24 22:20:47.000000000 +0200
+++ libkwave/CMakeLists.txt 2008-07-24 22:24:37.000000000 +0200
@@ -91,10 +91,8 @@
ADD_DEPENDENCIES(libkwave libkwavemt)
-IF (NOT USE_SYSTEM_LIB_AUDIOFILE)
TARGET_LINK_LIBRARIES(libkwave audiofile)
ADD_DEPENDENCIES(libkwave audiofile)
-ENDIF (NOT USE_SYSTEM_LIB_AUDIOFILE)
#############################################################################
@@ -107,7 +105,7 @@
#############################################################################
### install files ###
-INSTALL(TARGETS libkwave LIBRARY DESTINATION ${KDE3_LIB_DIR})
+INSTALL(TARGETS libkwave LIBRARY DESTINATION ${KDE3_LIBDIR})
#############################################################################
#############################################################################
--- doc/CMakeLists.txt.orig 2008-07-23 23:33:48.000000000 +0200
+++ doc/CMakeLists.txt 2008-07-24 00:10:36.000000000 +0200
@@ -184,7 +184,7 @@
MESSAGE(STATUS \"Installing \$ENV{DESTDIR}${KDE3_HTMLDIR}/${_lang}/kwave/common\")
")
INSTALL(CODE "EXECUTE_PROCESS(COMMAND ${CMAKE_COMMAND}
- -E create_symlink \"../common\"
+ -E create_symlink \"${KDE3_COMMONSYMLINK}\"
\"\$ENV{DESTDIR}${KDE3_HTMLDIR}/${_lang}/kwave/common\"
)")
--- cmake/KwaveLibaudiofileSupport.cmake.orig 2008-07-23 01:40:43.000000000 +0200
+++ cmake/KwaveLibaudiofileSupport.cmake 2008-07-23 01:40:45.000000000 +0200
@@ -44,17 +44,17 @@
MESSAGE(STATUS "Using the system's libaudiofile")
SET(USE_SYSTEM_LIB_AUDIOFILE BOOL ON)
ELSE (HAVE_AF_OPEN_VIRTUAL_FILE AND HAVE_AF_VIRTUAL_FILE_NEW)
- MESSAGE(STATUS "Using builtin libaudiofile")
+ MESSAGE(FATAL_ERROR "System libaudiofile not found")
ENDIF (HAVE_AF_OPEN_VIRTUAL_FILE AND HAVE_AF_VIRTUAL_FILE_NEW)
#############################################################################
### enable builtin libaudiofile if needed ###
-IF (NOT USE_SYSTEM_LIB_AUDIOFILE)
+IF (WITH_BUILTIN_LIBAUDIOFILE)
INCLUDE_DIRECTORIES(${PROJECT_SOURCE_DIR}/libaudiofile)
LINK_DIRECTORIES(${CMAKE_CURRENT_BINARY_DIR}/libaudiofile)
ADD_SUBDIRECTORY( libaudiofile )
-ENDIF (NOT USE_SYSTEM_LIB_AUDIOFILE)
+ENDIF (WITH_BUILTIN_LIBAUDIOFILE)
#############################################################################
#############################################################################
--- libgui/CMakeLists.txt.orig 2008-07-24 23:00:02.000000000 +0200
+++ libgui/CMakeLists.txt 2008-07-24 23:00:11.000000000 +0200
@@ -71,7 +71,7 @@
#############################################################################
### install files ###
-INSTALL(TARGETS libkwavegui LIBRARY DESTINATION ${KDE3_LIB_DIR})
+INSTALL(TARGETS libkwavegui LIBRARY DESTINATION ${KDE3_LIBDIR})
#############################################################################
#############################################################################
|
GitWeb