wok-6.x view portmidi/stuff/portmidi-217-Makefile.patch @ rev 8411

Up: cherokee to 1.0.20.
author Christopher Rogers <slaxemulator@gmail.com>
date Sat Feb 05 15:35:58 2011 +0000 (2011-02-05)
parents
children
line source
1 diff -Naur portmidi/CMakeLists.txt portmidi_patched/CMakeLists.txt
2 --- portmidi/CMakeLists.txt 2010-09-20 12:57:48.000000000 -0700
3 +++ portmidi_patched/CMakeLists.txt 2010-10-18 11:56:28.000000000 -0700
4 @@ -73,5 +73,4 @@
5 add_subdirectory(pm_dylib)
6
7 # Cannot figure out how to make an xcode Java application with CMake
8 -add_subdirectory(pm_java)
9
10 diff -Naur portmidi/pm_common/CMakeLists.txt portmidi_patched/pm_common/CMakeLists.txt
11 --- portmidi/pm_common/CMakeLists.txt 2010-09-20 12:57:48.000000000 -0700
12 +++ portmidi_patched/pm_common/CMakeLists.txt 2010-10-18 11:57:21.000000000 -0700
13 @@ -67,14 +67,6 @@
14 message(STATUS "SYSROOT: " ${CMAKE_OSX_SYSROOT})
15 else(APPLE)
16 # LINUX settings...
17 - include(FindJNI)
18 - message(STATUS "JAVA_JVM_LIB_PATH is " ${JAVA_JVM_LIB_PATH})
19 - message(STATUS "JAVA_INCLUDE_PATH is " ${JAVA_INCLUDE_PATH})
20 - message(STATUS "JAVA_INCLUDE_PATH2 is " ${JAVA_INCLUDE_PATH2})
21 - message(STATUS "JAVA_JVM_LIBRARY is " ${JAVA_JVM_LIBRARY})
22 - set(JAVA_INCLUDE_PATHS ${JAVA_INCLUDE_PATH} ${JAVA_INCLUDE_PATH2})
23 - # libjvm.so is found relative to JAVA_INCLUDE_PATH:
24 - set(JAVAVM_LIB ${JAVA_JVM_LIBRARY}/libjvm.so)
25
26 set(LINUXSRC pmlinuxalsa pmlinux finddefault)
27 prepend_path(LIBSRC ../pm_linux/ ${LINUXSRC})
28 @@ -99,7 +91,6 @@
29 set(PM_NEEDED_LIBS winmm.lib)
30 endif(WIN32)
31 endif(UNIX)
32 -set(JNI_EXTRA_LIBS ${PM_NEEDED_LIBS} ${JAVA_JVM_LIBRARY})
33
34 # this completes the list of library sources by adding shared code
35 list(APPEND LIBSRC pmutil portmidi)
36 @@ -110,18 +101,10 @@
37 target_link_libraries(portmidi-static ${PM_NEEDED_LIBS})
38
39 # define the jni library
40 -include_directories(${JAVA_INCLUDE_PATHS})
41
42 -set(JNISRC ${LIBSRC} ../pm_java/pmjni/pmjni.c)
43 -add_library(pmjni SHARED ${JNISRC})
44 -target_link_libraries(pmjni ${JNI_EXTRA_LIBS})
45 -set_target_properties(pmjni PROPERTIES EXECUTABLE_EXTENSION "jnilib")
46
47 # install the libraries (Linux and Mac OS X command line)
48 if(UNIX)
49 - INSTALL(TARGETS portmidi-static pmjni
50 - LIBRARY DESTINATION /usr/local/lib
51 - ARCHIVE DESTINATION /usr/local/lib)
52 # .h files installed by pm_dylib/CMakeLists.txt, so don't need them here
53 # INSTALL(FILES portmidi.h ../porttime/porttime.h
54 # DESTINATION /usr/local/include)
55 diff -Naur portmidi/pm_dylib/CMakeLists.txt portmidi_patched/pm_dylib/CMakeLists.txt
56 --- portmidi/pm_dylib/CMakeLists.txt 2009-11-19 21:41:09.000000000 -0800
57 +++ portmidi_patched/pm_dylib/CMakeLists.txt 2010-10-18 11:58:16.000000000 -0700
58 @@ -63,7 +63,6 @@
59 message(STATUS "SYSROOT: " ${CMAKE_OSX_SYSROOT})
60 else(APPLE)
61 # LINUX settings...
62 - include(FindJNI)
63 # message(STATUS "JAVA_JVM_LIB_PATH is " ${JAVA_JVM_LIB_PATH})
64 # message(STATUS "JAVA_INCLUDE_PATH is " ${JAVA_INCLUDE_PATH})
65 # note: should use JAVA_JVM_LIB_PATH, but it is not set properly
66 @@ -75,11 +74,7 @@
67 # JAVA_INCLUDE_PATH2; if no, then we need to make both JAVA_INCLUDE_PATH
68 # and JAVA_INCLUDE_PATH2 set by user (will need clear documentation
69 # because JAVA_INCLUDE_PATH2 is pretty obscure)
70 - set(JAVA_INCLUDE_PATH ${JAVA_INCLUDE_PATH-UNKNOWN}
71 - CACHE STRING "where to find Java SDK include directory")
72 - set(JAVA_INCLUDE_PATHS ${JAVA_INCLUDE_PATH} ${JAVA_INCLUDE_PATH}/linux)
73 # libjvm.so is found relative to JAVA_INCLUDE_PATH:
74 - set(JAVAVM_LIB ${JAVA_INCLUDE_PATH}/../jre/lib/i386/client/libjvm.so)
75
76 set(LINUXSRC pmlinuxalsa pmlinux finddefault)
77 prepend_path(LIBSRC ../pm_linux/ ${LINUXSRC})