|
|
fc32e37 |
--- portmidi-old/CMakeLists.txt 2022-07-26 13:58:56.502175056 +0200
|
|
|
fc32e37 |
+++ portmidi/CMakeLists.txt 2022-07-26 14:01:36.635235371 +0200
|
|
|
fc32e37 |
@@ -72,6 +72,4 @@
|
|
|
fc32e37 |
|
|
|
fc32e37 |
add_subdirectory(pm_dylib)
|
|
|
fc32e37 |
|
|
|
fc32e37 |
-# Cannot figure out how to make an xcode Java application with CMake
|
|
|
fc32e37 |
-add_subdirectory(pm_java)
|
|
|
fc32e37 |
|
|
|
fc32e37 |
--- portmidi-old/pm_common/CMakeLists.txt 2022-07-26 13:58:56.494175153 +0200
|
|
|
fc32e37 |
+++ portmidi/pm_common/CMakeLists.txt 2022-07-26 14:04:07.113412636 +0200
|
|
|
fc32e37 |
@@ -67,15 +67,6 @@
|
|
|
fc32e37 |
message(STATUS "SYSROOT: " ${CMAKE_OSX_SYSROOT})
|
|
|
fc32e37 |
else(APPLE)
|
|
|
fc32e37 |
# LINUX settings...
|
|
|
fc32e37 |
- include(FindJNI)
|
|
|
fc32e37 |
- message(STATUS "JAVA_JVM_LIB_PATH is " ${JAVA_JVM_LIB_PATH})
|
|
|
fc32e37 |
- message(STATUS "JAVA_INCLUDE_PATH is " ${JAVA_INCLUDE_PATH})
|
|
|
fc32e37 |
- message(STATUS "JAVA_INCLUDE_PATH2 is " ${JAVA_INCLUDE_PATH2})
|
|
|
fc32e37 |
- message(STATUS "JAVA_JVM_LIBRARY is " ${JAVA_JVM_LIBRARY})
|
|
|
fc32e37 |
- set(JAVA_INCLUDE_PATHS ${JAVA_INCLUDE_PATH} ${JAVA_INCLUDE_PATH2})
|
|
|
fc32e37 |
- # libjvm.so is found relative to JAVA_INCLUDE_PATH:
|
|
|
fc32e37 |
- set(JAVAVM_LIB ${JAVA_JVM_LIBRARY}/libjvm.so)
|
|
|
fc32e37 |
-
|
|
|
fc32e37 |
set(LINUXSRC pmlinuxalsa pmlinux finddefault)
|
|
|
fc32e37 |
prepend_path(LIBSRC ../pm_linux/ ${LINUXSRC})
|
|
|
fc32e37 |
list(APPEND LIBSRC ../porttime/ptlinux)
|
|
|
fc32e37 |
@@ -99,7 +90,6 @@
|
|
|
fc32e37 |
set(PM_NEEDED_LIBS winmm.lib)
|
|
|
fc32e37 |
endif(WIN32)
|
|
|
fc32e37 |
endif(UNIX)
|
|
|
fc32e37 |
-set(JNI_EXTRA_LIBS ${PM_NEEDED_LIBS} ${JAVA_JVM_LIBRARY})
|
|
|
fc32e37 |
|
|
|
fc32e37 |
# this completes the list of library sources by adding shared code
|
|
|
fc32e37 |
list(APPEND LIBSRC pmutil portmidi)
|
|
|
fc32e37 |
@@ -109,17 +99,9 @@
|
|
|
fc32e37 |
set_target_properties(portmidi-static PROPERTIES OUTPUT_NAME "portmidi_s")
|
|
|
fc32e37 |
target_link_libraries(portmidi-static ${PM_NEEDED_LIBS})
|
|
|
fc32e37 |
|
|
|
fc32e37 |
-# define the jni library
|
|
|
fc32e37 |
-include_directories(${JAVA_INCLUDE_PATHS})
|
|
|
fc32e37 |
-
|
|
|
fc32e37 |
-set(JNISRC ${LIBSRC} ../pm_java/pmjni/pmjni.c)
|
|
|
fc32e37 |
-add_library(pmjni SHARED ${JNISRC})
|
|
|
fc32e37 |
-target_link_libraries(pmjni ${JNI_EXTRA_LIBS})
|
|
|
fc32e37 |
-set_target_properties(pmjni PROPERTIES EXECUTABLE_EXTENSION "jnilib")
|
|
|
fc32e37 |
-
|
|
|
fc32e37 |
# install the libraries (Linux and Mac OS X command line)
|
|
|
fc32e37 |
if(UNIX)
|
|
|
fc32e37 |
- INSTALL(TARGETS portmidi-static pmjni
|
|
|
fc32e37 |
+ INSTALL(TARGETS portmidi-static
|
|
|
fc32e37 |
LIBRARY DESTINATION ${LIB_INSTALL_DIR}
|
|
|
fc32e37 |
ARCHIVE DESTINATION ${LIB_INSTALL_DIR})
|
|
|
fc32e37 |
# .h files installed by pm_dylib/CMakeLists.txt, so don't need them here
|
|
|
fc32e37 |
--- portmidi-old/pm_dylib/CMakeLists.txt 2022-07-26 13:58:56.494175153 +0200
|
|
|
fc32e37 |
+++ portmidi/pm_dylib/CMakeLists.txt 2022-07-26 14:05:24.435476039 +0200
|
|
|
fc32e37 |
@@ -63,20 +63,6 @@
|
|
|
fc32e37 |
message(STATUS "SYSROOT: " ${CMAKE_OSX_SYSROOT})
|
|
|
fc32e37 |
else(APPLE)
|
|
|
fc32e37 |
# LINUX settings...
|
|
|
fc32e37 |
- include(FindJNI)
|
|
|
fc32e37 |
- # message(STATUS "JAVA_JVM_LIB_PATH is " ${JAVA_JVM_LIB_PATH})
|
|
|
fc32e37 |
- # message(STATUS "JAVA_INCLUDE_PATH is " ${JAVA_INCLUDE_PATH})
|
|
|
fc32e37 |
- # note: should use JAVA_JVM_LIB_PATH, but it is not set properly
|
|
|
fc32e37 |
- # note: user might need to set JAVA_INCLUDE_PATH manually
|
|
|
fc32e37 |
- #
|
|
|
fc32e37 |
- # this will probably break on BSD and other Unix systems; the fix
|
|
|
fc32e37 |
- # depends on whether FindJNI can find Java or not. If yes, then
|
|
|
fc32e37 |
- # we should try to rely on automatically set JAVA_INCLUDE_PATH and
|
|
|
fc32e37 |
- # JAVA_INCLUDE_PATH2; if no, then we need to make both JAVA_INCLUDE_PATH
|
|
|
fc32e37 |
- # and JAVA_INCLUDE_PATH2 set by user (will need clear documentation
|
|
|
fc32e37 |
- # because JAVA_INCLUDE_PATH2 is pretty obscure)
|
|
|
fc32e37 |
- set(JAVAVM_LIB ${JAVA_JVM_LIBRARY})
|
|
|
fc32e37 |
-
|
|
|
fc32e37 |
set(LINUXSRC pmlinuxalsa pmlinux finddefault)
|
|
|
fc32e37 |
prepend_path(LIBSRC ../pm_linux/ ${LINUXSRC})
|
|
|
fc32e37 |
list(APPEND LIBSRC ../porttime/ptlinux)
|
|
|
fc32e37 |
@@ -102,7 +88,6 @@
|
|
|
fc32e37 |
# message(STATUS "JAVAVM_LIB: " ${JAVAVM_LIB})
|
|
|
fc32e37 |
endif(WIN32)
|
|
|
fc32e37 |
endif(UNIX)
|
|
|
fc32e37 |
-set(JNI_EXTRA_LIBS ${PM_NEEDED_LIBS} ${JAVAVM_LIB})
|
|
|
fc32e37 |
|
|
|
fc32e37 |
# this completes the list of library sources by adding shared code
|
|
|
fc32e37 |
set(SHARED_FILES pmutil portmidi)
|