1 |
radhermit 12/02/27 04:14:00 |
2 |
|
3 |
Added: portmidi-217-python.patch portmidi-217-cmake.patch |
4 |
Log: |
5 |
Initial import from sunrise (bug #90614, thanks to all contributors). |
6 |
|
7 |
(Portage version: 2.2.0_alpha87/cvs/Linux x86_64) |
8 |
|
9 |
Revision Changes Path |
10 |
1.1 media-libs/portmidi/files/portmidi-217-python.patch |
11 |
|
12 |
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-libs/portmidi/files/portmidi-217-python.patch?rev=1.1&view=markup |
13 |
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-libs/portmidi/files/portmidi-217-python.patch?rev=1.1&content-type=text/plain |
14 |
|
15 |
Index: portmidi-217-python.patch |
16 |
=================================================================== |
17 |
--- portmidi/pm_python/setup.py |
18 |
+++ portmidi/pm_python/setup.py |
19 |
@@ -15,12 +15,10 @@ |
20 |
|
21 |
|
22 |
DESCRIPTION = open('README_PYTHON.txt').read() |
23 |
-CHANGES = open('CHANGES.txt').read() |
24 |
-TODO = open('TODO.txt').read() |
25 |
|
26 |
EXTRAS = {} |
27 |
|
28 |
-long_description = DESCRIPTION + CHANGES + TODO |
29 |
+long_description = DESCRIPTION |
30 |
#import sys |
31 |
#if "checkdocs" in sys.argv: |
32 |
# print long_description |
33 |
@@ -173,7 +171,8 @@ |
34 |
EXTENSION = dict( |
35 |
ext_modules=[ |
36 |
Extension("pyportmidi._pyportmidi", [os.path.join("pyportmidi", "_pyportmidi.pyx")], |
37 |
library_dirs=["./linux"], |
38 |
+ include_dirs=["../pm_common", "../porttime"], |
39 |
libraries = ["portmidi", "asound", "pthread"] |
40 |
) |
41 |
] |
42 |
|
43 |
|
44 |
|
45 |
1.1 media-libs/portmidi/files/portmidi-217-cmake.patch |
46 |
|
47 |
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-libs/portmidi/files/portmidi-217-cmake.patch?rev=1.1&view=markup |
48 |
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-libs/portmidi/files/portmidi-217-cmake.patch?rev=1.1&content-type=text/plain |
49 |
|
50 |
Index: portmidi-217-cmake.patch |
51 |
=================================================================== |
52 |
--- portmidi/CMakeLists.txt |
53 |
+++ portmidi/CMakeLists.txt |
54 |
@@ -9,12 +9,11 @@ |
55 |
set(CMAKE_BUILD_TYPE Release CACHE STRING |
56 |
"Semicolon-separate list of supported configuration types") |
57 |
# set default directories but don't override cached values... |
58 |
- set(CMAKE_LIBRARY_OUTPUT_DIRECTORY ${CMAKE_CACHEFILE_DIR}/${CMAKE_BUILD_TYPE} |
59 |
+ set(CMAKE_LIBRARY_OUTPUT_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR} |
60 |
CACHE STRING "libraries go here") |
61 |
- set(CMAKE_ARCHIVE_OUTPUT_DIRECTORY ${CMAKE_CACHEFILE_DIR}/${CMAKE_BUILD_TYPE} |
62 |
+ set(CMAKE_ARCHIVE_OUTPUT_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR} |
63 |
CACHE STRING "libraries go here") |
64 |
- set(CMAKE_RUNTIME_OUTPUT_DIRECTORY |
65 |
- ${CMAKE_CACHEFILE_DIR}/${CMAKE_BUILD_TYPE} |
66 |
+ set(CMAKE_RUNTIME_OUTPUT_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR} |
67 |
CACHE STRING "executables go here") |
68 |
|
69 |
else(UNIX) |
70 |
@@ -68,10 +67,20 @@ |
71 |
include_directories(pm_common porttime) |
72 |
add_subdirectory(pm_common) |
73 |
|
74 |
-add_subdirectory(pm_test) |
75 |
+option(PORTMIDI_ENABLE_JAVA "Enable Java bindings support" ON) |
76 |
+option(PORTMIDI_ENABLE_STATIC "Build and install static libraries" OFF) |
77 |
+option(PORTMIDI_ENABLE_TEST "Build test programs" ON) |
78 |
+ |
79 |
+if(PORTMIDI_ENABLE_TEST) |
80 |
+ add_subdirectory(pm_test) |
81 |
+endif(PORTMIDI_ENABLE_TEST) |
82 |
|
83 |
add_subdirectory(pm_dylib) |
84 |
|
85 |
# Cannot figure out how to make an xcode Java application with CMake |
86 |
-add_subdirectory(pm_java) |
87 |
+if(PORTMIDI_ENABLE_JAVA) |
88 |
+ set(JAR_INSTALL_DIR share/java |
89 |
+ CACHE STRING "Define directory name for jar installation") |
90 |
+ add_subdirectory(pm_java) |
91 |
+endif(PORTMIDI_ENABLE_JAVA) |
92 |
|
93 |
--- portmidi/pm_common/CMakeLists.txt |
94 |
+++ portmidi/pm_common/CMakeLists.txt |
95 |
@@ -44,9 +44,6 @@ |
96 |
|
97 |
# first include the appropriate system-dependent file: |
98 |
if(UNIX) |
99 |
- # add the -g switch for Linux and Mac OS X (not used in Win32) |
100 |
- set (CMAKE_C_FLAGS_DEBUG "-g ${CMAKE_C_FLAGS_DEBUG}" |
101 |
- CACHE STRING "enable extra checks for debugging" FORCE) |
102 |
if(APPLE) |
103 |
set(MACSRC pmmacosxcm pmmac readbinaryplist finddefault) |
104 |
prepend_path(LIBSRC ../pm_mac/ ${MACSRC}) |
105 |
@@ -62,19 +59,23 @@ |
106 |
${COREMIDI_LIB} ${CORESERVICES_LIB} |
107 |
CACHE INTERNAL "") |
108 |
|
109 |
- set(JAVAVM_LIB "${FRAMEWORK_PATH}/JavaVM.framework") |
110 |
- set(JAVA_INCLUDE_PATHS ${JAVAVM_LIB}/Headers) |
111 |
+ if(PORTMIDI_ENABLE_JAVA) |
112 |
+ set(JAVAVM_LIB "${FRAMEWORK_PATH}/JavaVM.framework") |
113 |
+ set(JAVA_INCLUDE_PATHS ${JAVAVM_LIB}/Headers) |
114 |
+ endif(PORTMIDI_ENABLE_JAVA) |
115 |
message(STATUS "SYSROOT: " ${CMAKE_OSX_SYSROOT}) |
116 |
else(APPLE) |
117 |
# LINUX settings... |
118 |
- include(FindJNI) |
119 |
- message(STATUS "JAVA_JVM_LIB_PATH is " ${JAVA_JVM_LIB_PATH}) |
120 |
- message(STATUS "JAVA_INCLUDE_PATH is " ${JAVA_INCLUDE_PATH}) |
121 |
- message(STATUS "JAVA_INCLUDE_PATH2 is " ${JAVA_INCLUDE_PATH2}) |
122 |
- message(STATUS "JAVA_JVM_LIBRARY is " ${JAVA_JVM_LIBRARY}) |
123 |
- set(JAVA_INCLUDE_PATHS ${JAVA_INCLUDE_PATH} ${JAVA_INCLUDE_PATH2}) |
124 |
- # libjvm.so is found relative to JAVA_INCLUDE_PATH: |
125 |
- set(JAVAVM_LIB ${JAVA_JVM_LIBRARY}/libjvm.so) |
126 |
+ if(PORTMIDI_ENABLE_JAVA) |
127 |
+ include(FindJNI) |
128 |
+ message(STATUS "JAVA_JVM_LIB_PATH is " ${JAVA_JVM_LIB_PATH}) |
129 |
+ message(STATUS "JAVA_INCLUDE_PATH is " ${JAVA_INCLUDE_PATH}) |
130 |
+ message(STATUS "JAVA_INCLUDE_PATH2 is " ${JAVA_INCLUDE_PATH2}) |
131 |
+ message(STATUS "JAVA_JVM_LIBRARY is " ${JAVA_JVM_LIBRARY}) |
132 |
+ set(JAVA_INCLUDE_PATHS ${JAVA_INCLUDE_PATH} ${JAVA_INCLUDE_PATH2}) |
133 |
+ # libjvm.so is found relative to JAVA_INCLUDE_PATH: |
134 |
+ set(JAVAVM_LIB ${JAVA_JVM_LIBRARY}/libjvm.so) |
135 |
+ endif(PORTMIDI_ENABLE_JAVA) |
136 |
|
137 |
set(LINUXSRC pmlinuxalsa pmlinux finddefault) |
138 |
prepend_path(LIBSRC ../pm_linux/ ${LINUXSRC}) |
139 |
@@ -88,10 +89,12 @@ |
140 |
# /MD is multithread DLL, /MT is multithread. Change to static: |
141 |
include(../pm_win/static.cmake) |
142 |
|
143 |
- include(FindJNI) |
144 |
+ if(PORTMIDI_ENABLE_JAVA) |
145 |
+ include(FindJNI) |
146 |
|
147 |
- set(JAVA_INCLUDE_PATHS ${JAVA_INCLUDE_PATH} ${JAVA_INCLUDE_PATH2}) |
148 |
- # message(STATUS "JAVA_INCLUDE_PATHS: " ${JAVA_INCLUDE_PATHS}) |
149 |
+ set(JAVA_INCLUDE_PATHS ${JAVA_INCLUDE_PATH} ${JAVA_INCLUDE_PATH2}) |
150 |
+ # message(STATUS "JAVA_INCLUDE_PATHS: " ${JAVA_INCLUDE_PATHS}) |
151 |
+ endif(PORTMIDI_ENABLE_JAVA) |
152 |
|
153 |
set(WINSRC pmwin pmwinmm) |
154 |
prepend_path(LIBSRC ../pm_win/ ${WINSRC}) |
155 |
@@ -99,29 +102,43 @@ |
156 |
set(PM_NEEDED_LIBS winmm.lib) |
157 |
endif(WIN32) |
158 |
endif(UNIX) |
159 |
-set(JNI_EXTRA_LIBS ${PM_NEEDED_LIBS} ${JAVA_JVM_LIBRARY}) |
160 |
+ |
161 |
+if(PORTMIDI_ENABLE_JAVA) |
162 |
+ set(JNI_EXTRA_LIBS ${PM_NEEDED_LIBS} ${JAVA_JVM_LIBRARY}) |
163 |
+endif(PORTMIDI_ENABLE_JAVA) |
164 |
|
165 |
# this completes the list of library sources by adding shared code |
166 |
list(APPEND LIBSRC pmutil portmidi) |
167 |
|
168 |
# now add the shared files to make the complete list of library sources |
169 |
-add_library(portmidi-static ${LIBSRC}) |
170 |
-set_target_properties(portmidi-static PROPERTIES OUTPUT_NAME "portmidi_s") |
171 |
-target_link_libraries(portmidi-static ${PM_NEEDED_LIBS}) |
172 |
- |
173 |
-# define the jni library |
174 |
-include_directories(${JAVA_INCLUDE_PATHS}) |
175 |
- |
176 |
-set(JNISRC ${LIBSRC} ../pm_java/pmjni/pmjni.c) |
177 |
-add_library(pmjni SHARED ${JNISRC}) |
178 |
-target_link_libraries(pmjni ${JNI_EXTRA_LIBS}) |
179 |
-set_target_properties(pmjni PROPERTIES EXECUTABLE_EXTENSION "jnilib") |
180 |
+if(PORTMIDI_ENABLE_STATIC) |
181 |
+ add_library(portmidi-static ${LIBSRC}) |
182 |
+ set_target_properties(portmidi-static PROPERTIES OUTPUT_NAME "portmidi") |
183 |
+ target_link_libraries(portmidi-static ${PM_NEEDED_LIBS}) |
184 |
+endif(PORTMIDI_ENABLE_STATIC) |
185 |
+ |
186 |
+if(PORTMIDI_ENABLE_JAVA) |
187 |
+ # define the jni library |
188 |
+ include_directories(${JAVA_INCLUDE_PATHS}) |
189 |
+ |
190 |
+ set(JNISRC ${LIBSRC} ../pm_java/pmjni/pmjni.c) |
191 |
+ add_library(pmjni SHARED ${JNISRC}) |
192 |
+ target_link_libraries(pmjni ${JNI_EXTRA_LIBS}) |
193 |
+ set_target_properties(pmjni PROPERTIES EXECUTABLE_EXTENSION "jnilib") |
194 |
+endif(PORTMIDI_ENABLE_JAVA) |
195 |
|
196 |
# install the libraries (Linux and Mac OS X command line) |
197 |
if(UNIX) |
198 |
- INSTALL(TARGETS portmidi-static pmjni |
199 |
- LIBRARY DESTINATION /usr/local/lib |
200 |
- ARCHIVE DESTINATION /usr/local/lib) |
201 |
+ if(PORTMIDI_ENABLE_STATIC) |
202 |
+ INSTALL(TARGETS portmidi-static |
203 |
+ LIBRARY DESTINATION lib${LIB_SUFFIX} |
204 |
+ ARCHIVE DESTINATION lib${LIB_SUFFIX}) |
205 |
+ endif(PORTMIDI_ENABLE_STATIC) |
206 |
+ if(PORTMIDI_ENABLE_JAVA) |
207 |
+ INSTALL(TARGETS pmjni |
208 |
+ LIBRARY DESTINATION lib${LIB_SUFFIX} |
209 |
+ ARCHIVE DESTINATION lib${LIB_SUFFIX}) |
210 |
+ endif(PORTMIDI_ENABLE_JAVA) |
211 |
# .h files installed by pm_dylib/CMakeLists.txt, so don't need them here |
212 |
# INSTALL(FILES portmidi.h ../porttime/porttime.h |
213 |
# DESTINATION /usr/local/include) |
214 |
--- portmidi/pm_dylib/CMakeLists.txt |
215 |
+++ portmidi/pm_dylib/CMakeLists.txt |
216 |
@@ -39,9 +39,6 @@ |
217 |
|
218 |
# first include the appropriate system-dependent file: |
219 |
if(UNIX) |
220 |
- # add the -g switch for Linux and Mac OS X (not used in Win32) |
221 |
- set (CMAKE_C_FLAGS_DEBUG "-g ${CMAKE_C_FLAGS_DEBUG}" |
222 |
- CACHE STRING "enable extra checks for debugging" FORCE) |
223 |
if(APPLE) |
224 |
set(MACSRC pmmacosxcm pmmac readbinaryplist finddefault) |
225 |
prepend_path(LIBSRC ../pm_mac/ ${MACSRC}) |
226 |
@@ -63,7 +60,8 @@ |
227 |
message(STATUS "SYSROOT: " ${CMAKE_OSX_SYSROOT}) |
228 |
else(APPLE) |
229 |
# LINUX settings... |
230 |
- include(FindJNI) |
231 |
+ if(PORTMIDI_ENABLE_JAVA) |
232 |
+ include(FindJNI) |
233 |
# message(STATUS "JAVA_JVM_LIB_PATH is " ${JAVA_JVM_LIB_PATH}) |
234 |
# message(STATUS "JAVA_INCLUDE_PATH is " ${JAVA_INCLUDE_PATH}) |
235 |
# note: should use JAVA_JVM_LIB_PATH, but it is not set properly |
236 |
@@ -75,11 +73,8 @@ |
237 |
# JAVA_INCLUDE_PATH2; if no, then we need to make both JAVA_INCLUDE_PATH |
238 |
# and JAVA_INCLUDE_PATH2 set by user (will need clear documentation |
239 |
# because JAVA_INCLUDE_PATH2 is pretty obscure) |
240 |
- set(JAVA_INCLUDE_PATH ${JAVA_INCLUDE_PATH-UNKNOWN} |
241 |
- CACHE STRING "where to find Java SDK include directory") |
242 |
- set(JAVA_INCLUDE_PATHS ${JAVA_INCLUDE_PATH} ${JAVA_INCLUDE_PATH}/linux) |
243 |
- # libjvm.so is found relative to JAVA_INCLUDE_PATH: |
244 |
- set(JAVAVM_LIB ${JAVA_INCLUDE_PATH}/../jre/lib/i386/client/libjvm.so) |
245 |
+ set(JAVAVM_LIB ${JAVA_JVM_LIBRARY}) |
246 |
+ endif(PORTMIDI_ENABLE_JAVA) |
247 |
|
248 |
set(LINUXSRC pmlinuxalsa pmlinux finddefault) |
249 |
prepend_path(LIBSRC ../pm_linux/ ${LINUXSRC}) |
250 |
@@ -91,13 +86,15 @@ |
251 |
if(WIN32) |
252 |
# /MDd is multithread debug DLL, /MTd is multithread debug |
253 |
# /MD is multithread DLL, /MT is multithread |
254 |
- |
255 |
- include(FindJNI) |
256 |
- # note: should use JAVA_JVM_LIB_PATH, but it is not set properly |
257 |
- set(JAVAVM_LIB ${JAVA_INCLUDE_PATH}/../lib/jvm.lib) |
258 |
|
259 |
- set(JAVA_INCLUDE_PATHS ${JAVA_INCLUDE_PATH} ${JAVA_INCLUDE_PATH2}) |
260 |
- # message(STATUS "JAVA_INCLUDE_PATHS: " ${JAVA_INCLUDE_PATHS}) |
261 |
+ if(PORTMIDI_ENABLE_JAVA) |
262 |
+ include(FindJNI) |
263 |
+ # note: should use JAVA_JVM_LIB_PATH, but it is not set properly |
264 |
+ set(JAVAVM_LIB ${JAVA_INCLUDE_PATH}/../lib/jvm.lib) |
265 |
+ |
266 |
+ set(JAVA_INCLUDE_PATHS ${JAVA_INCLUDE_PATH} ${JAVA_INCLUDE_PATH2}) |
267 |
+ # message(STATUS "JAVA_INCLUDE_PATHS: " ${JAVA_INCLUDE_PATHS}) |
268 |
+ endif(PORTMIDI_ENABLE_JAVA) |
269 |
|
270 |
set(WINSRC pmwin pmwinmm) |
271 |
prepend_path(LIBSRC ../pm_win/ ${WINSRC}) |
272 |
@@ -106,7 +103,10 @@ |
273 |
# message(STATUS "JAVAVM_LIB: " ${JAVAVM_LIB}) |
274 |
endif(WIN32) |
275 |
endif(UNIX) |
276 |
+ |
277 |
+if(PORTMIDI_ENABLE_JAVA) |
278 |
set(JNI_EXTRA_LIBS ${PM_NEEDED_LIBS} ${JAVAVM_LIB}) |
279 |
+endif(PORTMIDI_ENABLE_JAVA) |
280 |
|
281 |
# this completes the list of library sources by adding shared code |
282 |
set(SHARED_FILES pmutil portmidi) |
283 |
@@ -120,8 +120,8 @@ |
284 |
# install the libraries (Linux and Mac OS X command line) |
285 |
if(UNIX) |
286 |
INSTALL(TARGETS portmidi-dynamic |
287 |
- LIBRARY DESTINATION /usr/local/lib |
288 |
- ARCHIVE DESTINATION /usr/local/lib) |
289 |
+ LIBRARY DESTINATION lib${LIB_SUFFIX} |
290 |
+ ARCHIVE DESTINATION lib${LIB_SUFFIX}) |
291 |
INSTALL(FILES ../pm_common/portmidi.h ../porttime/porttime.h |
292 |
- DESTINATION /usr/local/include) |
293 |
+ DESTINATION include) |
294 |
endif(UNIX) |
295 |
--- portmidi/pm_java/CMakeLists.txt |
296 |
+++ portmidi/pm_java/CMakeLists.txt |
297 |
@@ -5,43 +5,24 @@ |
298 |
# java not dealt with in CMake -- see pm_mac/pm_mac.xcodeproj |
299 |
else(APPLE) |
300 |
# linux |
301 |
- set(JPORTMIDICLASS JPortMidi.class JPortMidiException.class |
302 |
- JPortMidiApi.class) |
303 |
- set(PMDEFAULTSCLASS PmDefaultsFrame.class PmDefaults.class) |
304 |
- prepend_path(JPORTMIDICLASS2 jportmidi/ ${JPORTMIDICLASS}) |
305 |
- prepend_path(PMDEFAULTSCLASS2 pmdefaults/ ${PMDEFAULTSCLASS}) |
306 |
- set(PMDEFAULTS_ALL_CLASSES ${JPORTMIDICLASS2} ${PMDEFAULTSCLASS2}) |
307 |
- # message(STATUS "PMDEFAULTS_ALL_CLASSES is " ${PMDEFAULTS_ALL_CLASSES}) |
308 |
- add_custom_command(OUTPUT pmdefaults/PmDefaultsFrame.class |
309 |
- COMMAND javac -classpath . pmdefaults/PmDefaultsFrame.java |
310 |
- MAIN_DEPENDENCY pmdefaults/PmDefaultsFrame.java |
311 |
- DEPENDS pmdefaults/PmDefaults.java |
312 |
- WORKING_DIRECTORY pm_java) |
313 |
- add_custom_command(OUTPUT pmdefaults/PmDefaults.class |
314 |
- COMMAND javac -classpath . pmdefaults/PmDefaults.java |
315 |
- MAIN_DEPENDENCY pmdefaults/PmDefaults.java |
316 |
- DEPENDS pmdefaults/PmDefaultsFrame.java |
317 |
- WORKING_DIRECTORY pm_java) |
318 |
- add_custom_command(OUTPUT ${CMAKE_LIBRARY_OUTPUT_DIRECTORY}/pmdefaults.jar |
319 |
- COMMAND cp pmdefaults/portmusic_logo.png . |
320 |
- COMMAND jar cmf pmdefaults/manifest.txt pmdefaults.jar |
321 |
- pmdefaults/*.class portmusic_logo.png jportmidi/*.class |
322 |
- COMMAND chmod +x pmdefaults/pmdefaults |
323 |
- COMMAND cp pmdefaults/pmdefaults ${CMAKE_LIBRARY_OUTPUT_DIRECTORY} |
324 |
- COMMAND mv pmdefaults.jar ${CMAKE_LIBRARY_OUTPUT_DIRECTORY} |
325 |
- COMMAND rm portmusic_logo.png |
326 |
- MAIN_DEPENDENCY pmdefaults/PmDefaults.class |
327 |
- DEPENDS ${PMDEFAULTS_ALL_CLASSES} |
328 |
- WORKING_DIRECTORY pm_java) |
329 |
- add_custom_target(pmdefaults_target ALL |
330 |
- DEPENDS ${CMAKE_LIBRARY_OUTPUT_DIRECTORY}/pmdefaults.jar) |
331 |
- # message(STATUS "add_custom_target: pmdefaults.jar") |
332 |
+ set(JAVA_CLASSES jportmidi pmdefaults) |
333 |
+ add_custom_command(OUTPUT ${JAVA_CLASSES} |
334 |
+ COMMAND javac -d ${CMAKE_CURRENT_BINARY_DIR} jportmidi/*.java pmdefaults/*.java |
335 |
+ WORKING_DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR}) |
336 |
+ add_custom_command(OUTPUT ${CMAKE_CURRENT_BINARY_DIR}/pmdefaults.jar |
337 |
+ DEPENDS ${JAVA_CLASSES} |
338 |
+ COMMAND jar cmf pmdefaults/manifest.txt ${CMAKE_CURRENT_BINARY_DIR}/pmdefaults.jar |
339 |
+ -C pmdefaults portmusic_logo.png -C ${CMAKE_CURRENT_BINARY_DIR} jportmidi |
340 |
+ -C ${CMAKE_CURRENT_BINARY_DIR} pmdefaults |
341 |
+ WORKING_DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR}) |
342 |
+ add_custom_target(pmdefaults.jar ALL |
343 |
+ DEPENDS ${CMAKE_CURRENT_BINARY_DIR}/pmdefaults.jar) |
344 |
|
345 |
# install the libraries (Linux only) |
346 |
- INSTALL(FILES ${CMAKE_LIBRARY_OUTPUT_DIRECTORY}/pmdefaults.jar |
347 |
- DESTINATION /usr/share/java) |
348 |
- INSTALL(PROGRAMS ${CMAKE_LIBRARY_OUTPUT_DIRECTORY}/pmdefaults |
349 |
- DESTINATION /usr/local/bin) |
350 |
+ INSTALL(FILES ${CMAKE_CURRENT_BINARY_DIR}/pmdefaults.jar |
351 |
+ DESTINATION ${JAR_INSTALL_DIR}) |
352 |
+ INSTALL(PROGRAMS ${CMAKE_CURRENT_SOURCE_DIR}/pmdefaults/pmdefaults |
353 |
+ DESTINATION bin) |
354 |
endif(APPLE) |
355 |
endif(UNIX) |
356 |
# In windows, use pm_java/make.bat |
357 |
--- portmidi/pm_test/CMakeLists.txt |
358 |
+++ portmidi/pm_test/CMakeLists.txt |
359 |
@@ -12,8 +12,8 @@ |
360 |
|
361 |
macro(make_a_test name) |
362 |
add_executable(${name} ${name}.c) |
363 |
- target_link_libraries(${name} portmidi-static ${PM_NEEDED_LIBS}) |
364 |
- add_dependencies(${name} portmidi-static) |
365 |
+ target_link_libraries(${name} portmidi ${PM_NEEDED_LIBS}) |
366 |
+ add_dependencies(${name} portmidi) |
367 |
endmacro(make_a_test) |
368 |
|
369 |
make_a_test(test) |