diff --git a/CMakeLists.txt b/CMakeLists.txt index 4919b78..d4b5ec2 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -72,6 +72,3 @@ add_subdirectory(pm_test) add_subdirectory(pm_dylib) -# Cannot figure out how to make an xcode Java application with CMake -add_subdirectory(pm_java) - diff --git a/pm_common/CMakeLists.txt b/pm_common/CMakeLists.txt index e171047..421a68c 100644 --- a/pm_common/CMakeLists.txt +++ b/pm_common/CMakeLists.txt @@ -66,15 +66,6 @@ if(UNIX) set(JAVA_INCLUDE_PATHS ${JAVAVM_LIB}/Headers) 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}) @@ -99,7 +90,6 @@ else(UNIX) 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) @@ -109,17 +99,10 @@ add_library(portmidi-static ${LIBSRC}) set_target_properties(portmidi-static PROPERTIES OUTPUT_NAME "portmidi_s") 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 + INSTALL(TARGETS portmidi-static LIBRARY DESTINATION /usr/local/lib ARCHIVE DESTINATION /usr/local/lib) # .h files installed by pm_dylib/CMakeLists.txt, so don't need them here diff --git a/pm_dylib/CMakeLists.txt b/pm_dylib/CMakeLists.txt index f693dd6..fcadf1d 100644 --- a/pm_dylib/CMakeLists.txt +++ b/pm_dylib/CMakeLists.txt @@ -63,24 +63,6 @@ if(UNIX) 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 - # note: user might need to set JAVA_INCLUDE_PATH manually - # - # this will probably break on BSD and other Unix systems; the fix - # depends on whether FindJNI can find Java or not. If yes, then - # we should try to rely on automatically set JAVA_INCLUDE_PATH and - # 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}) list(APPEND LIBSRC ../porttime/ptlinux)