Attachment #251167 for bug #90614

Lines 73-77 Link Here

(-)portmidi/CMakeLists.txt (-1 lines)
73	add_subdirectory(pm_dylib)	73	add_subdirectory(pm_dylib)
74		74
75	# Cannot figure out how to make an xcode Java application with CMake	75	# Cannot figure out how to make an xcode Java application with CMake
76	add_subdirectory(pm_java)
77		76




    message(STATUS "SYSROOT: " ${CMAKE_OSX_SYSROOT})
  else(APPLE)
    # LINUX settings...
    include(FindJNI)
    message(STATUS "JAVA_JVM_LIB_PATH is " ${JAVA_JVM_LIB_PATH})
    message(STATUS "JAVA_INCLUDE_PATH is " ${JAVA_INCLUDE_PATH})
    message(STATUS "JAVA_INCLUDE_PATH2 is " ${JAVA_INCLUDE_PATH2})
    message(STATUS "JAVA_JVM_LIBRARY is " ${JAVA_JVM_LIBRARY})
    set(JAVA_INCLUDE_PATHS ${JAVA_INCLUDE_PATH} ${JAVA_INCLUDE_PATH2})
    # libjvm.so is found relative to JAVA_INCLUDE_PATH:
    set(JAVAVM_LIB ${JAVA_JVM_LIBRARY}/libjvm.so)

    set(LINUXSRC pmlinuxalsa pmlinux finddefault)
    prepend_path(LIBSRC ../pm_linux/ ${LINUXSRC})

    set(PM_NEEDED_LIBS winmm.lib)
  endif(WIN32)
endif(UNIX)
set(JNI_EXTRA_LIBS ${PM_NEEDED_LIBS} ${JAVA_JVM_LIBRARY})

# this completes the list of library sources by adding shared code
list(APPEND LIBSRC pmutil portmidi)

target_link_libraries(portmidi-static ${PM_NEEDED_LIBS})

# define the jni library
include_directories(${JAVA_INCLUDE_PATHS})

set(JNISRC ${LIBSRC} ../pm_java/pmjni/pmjni.c)
add_library(pmjni SHARED ${JNISRC})
target_link_libraries(pmjni ${JNI_EXTRA_LIBS})
set_target_properties(pmjni PROPERTIES EXECUTABLE_EXTENSION "jnilib")

# install the libraries (Linux and Mac OS X command line)
if(UNIX)
  INSTALL(TARGETS portmidi-static pmjni
    LIBRARY DESTINATION /usr/local/lib
    ARCHIVE DESTINATION /usr/local/lib)
# .h files installed by pm_dylib/CMakeLists.txt, so don't need them here
#  INSTALL(FILES portmidi.h ../porttime/porttime.h
#    DESTINATION /usr/local/include)




    message(STATUS "SYSROOT: " ${CMAKE_OSX_SYSROOT})
  else(APPLE)
    # LINUX settings...
    include(FindJNI)
    # message(STATUS "JAVA_JVM_LIB_PATH is " ${JAVA_JVM_LIB_PATH})
    # message(STATUS "JAVA_INCLUDE_PATH is " ${JAVA_INCLUDE_PATH})
    # note: should use JAVA_JVM_LIB_PATH, but it is not set properly

    # JAVA_INCLUDE_PATH2; if no, then we need to make both JAVA_INCLUDE_PATH
    # and JAVA_INCLUDE_PATH2 set by user (will need clear documentation
    # because JAVA_INCLUDE_PATH2 is pretty obscure)
    set(JAVA_INCLUDE_PATH  ${JAVA_INCLUDE_PATH-UNKNOWN}
        CACHE STRING "where to find Java SDK include directory")
    set(JAVA_INCLUDE_PATHS ${JAVA_INCLUDE_PATH} ${JAVA_INCLUDE_PATH}/linux)
    # libjvm.so is found relative to JAVA_INCLUDE_PATH:
    set(JAVAVM_LIB ${JAVA_INCLUDE_PATH}/../jre/lib/i386/client/libjvm.so)

    set(LINUXSRC pmlinuxalsa pmlinux finddefault)
    prepend_path(LIBSRC ../pm_linux/ ${LINUXSRC})

Return to bug 90614

Lines 67-80 Link Here

(-)portmidi/pm_common/CMakeLists.txt (-17 lines)
67	message(STATUS "SYSROOT: " ${CMAKE_OSX_SYSROOT})	67	message(STATUS "SYSROOT: " ${CMAKE_OSX_SYSROOT})
68	else(APPLE)	68	else(APPLE)
69	# LINUX settings...	69	# LINUX settings...
70	include(FindJNI)
71	message(STATUS "JAVA_JVM_LIB_PATH is " ${JAVA_JVM_LIB_PATH})
72	message(STATUS "JAVA_INCLUDE_PATH is " ${JAVA_INCLUDE_PATH})
73	message(STATUS "JAVA_INCLUDE_PATH2 is " ${JAVA_INCLUDE_PATH2})
74	message(STATUS "JAVA_JVM_LIBRARY is " ${JAVA_JVM_LIBRARY})
75	set(JAVA_INCLUDE_PATHS ${JAVA_INCLUDE_PATH} ${JAVA_INCLUDE_PATH2})
76	# libjvm.so is found relative to JAVA_INCLUDE_PATH:
77	set(JAVAVM_LIB ${JAVA_JVM_LIBRARY}/libjvm.so)
78		70
79	set(LINUXSRC pmlinuxalsa pmlinux finddefault)	71	set(LINUXSRC pmlinuxalsa pmlinux finddefault)
80	prepend_path(LIBSRC ../pm_linux/ ${LINUXSRC})	72	prepend_path(LIBSRC ../pm_linux/ ${LINUXSRC})
Lines 99-105 Link Here
99	set(PM_NEEDED_LIBS winmm.lib)	91	set(PM_NEEDED_LIBS winmm.lib)
100	endif(WIN32)	92	endif(WIN32)
101	endif(UNIX)	93	endif(UNIX)
102	set(JNI_EXTRA_LIBS ${PM_NEEDED_LIBS} ${JAVA_JVM_LIBRARY})
103		94
104	# this completes the list of library sources by adding shared code	95	# this completes the list of library sources by adding shared code
105	list(APPEND LIBSRC pmutil portmidi)	96	list(APPEND LIBSRC pmutil portmidi)
Lines 110-127 Link Here
110	target_link_libraries(portmidi-static ${PM_NEEDED_LIBS})	101	target_link_libraries(portmidi-static ${PM_NEEDED_LIBS})
111		102
112	# define the jni library	103	# define the jni library
113	include_directories(${JAVA_INCLUDE_PATHS})
114		104
115	set(JNISRC ${LIBSRC} ../pm_java/pmjni/pmjni.c)
116	add_library(pmjni SHARED ${JNISRC})
117	target_link_libraries(pmjni ${JNI_EXTRA_LIBS})
118	set_target_properties(pmjni PROPERTIES EXECUTABLE_EXTENSION "jnilib")
119		105
120	# install the libraries (Linux and Mac OS X command line)	106	# install the libraries (Linux and Mac OS X command line)
121	if(UNIX)	107	if(UNIX)
122	INSTALL(TARGETS portmidi-static pmjni
123	LIBRARY DESTINATION /usr/local/lib
124	ARCHIVE DESTINATION /usr/local/lib)
125	# .h files installed by pm_dylib/CMakeLists.txt, so don't need them here	108	# .h files installed by pm_dylib/CMakeLists.txt, so don't need them here
126	# INSTALL(FILES portmidi.h ../porttime/porttime.h	109	# INSTALL(FILES portmidi.h ../porttime/porttime.h
127	# DESTINATION /usr/local/include)	110	# DESTINATION /usr/local/include)

Lines 63-69 Link Here

(-)portmidi/pm_dylib/CMakeLists.txt (-5 lines)
63	message(STATUS "SYSROOT: " ${CMAKE_OSX_SYSROOT})	63	message(STATUS "SYSROOT: " ${CMAKE_OSX_SYSROOT})
64	else(APPLE)	64	else(APPLE)
65	# LINUX settings...	65	# LINUX settings...
66	include(FindJNI)
67	# message(STATUS "JAVA_JVM_LIB_PATH is " ${JAVA_JVM_LIB_PATH})	66	# message(STATUS "JAVA_JVM_LIB_PATH is " ${JAVA_JVM_LIB_PATH})
68	# message(STATUS "JAVA_INCLUDE_PATH is " ${JAVA_INCLUDE_PATH})	67	# message(STATUS "JAVA_INCLUDE_PATH is " ${JAVA_INCLUDE_PATH})
69	# note: should use JAVA_JVM_LIB_PATH, but it is not set properly	68	# note: should use JAVA_JVM_LIB_PATH, but it is not set properly
Lines 75-85 Link Here
75	# JAVA_INCLUDE_PATH2; if no, then we need to make both JAVA_INCLUDE_PATH	74	# JAVA_INCLUDE_PATH2; if no, then we need to make both JAVA_INCLUDE_PATH
76	# and JAVA_INCLUDE_PATH2 set by user (will need clear documentation	75	# and JAVA_INCLUDE_PATH2 set by user (will need clear documentation
77	# because JAVA_INCLUDE_PATH2 is pretty obscure)	76	# because JAVA_INCLUDE_PATH2 is pretty obscure)
78	set(JAVA_INCLUDE_PATH ${JAVA_INCLUDE_PATH-UNKNOWN}
79	CACHE STRING "where to find Java SDK include directory")
80	set(JAVA_INCLUDE_PATHS ${JAVA_INCLUDE_PATH} ${JAVA_INCLUDE_PATH}/linux)
81	# libjvm.so is found relative to JAVA_INCLUDE_PATH:	77	# libjvm.so is found relative to JAVA_INCLUDE_PATH:
82	set(JAVAVM_LIB ${JAVA_INCLUDE_PATH}/../jre/lib/i386/client/libjvm.so)
83		78
84	set(LINUXSRC pmlinuxalsa pmlinux finddefault)	79	set(LINUXSRC pmlinuxalsa pmlinux finddefault)
85	prepend_path(LIBSRC ../pm_linux/ ${LINUXSRC})	80	prepend_path(LIBSRC ../pm_linux/ ${LINUXSRC})