wok annotate portmidi/stuff/portmidi-217-Makefile.patch @ rev 16842

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