|
 |
f6ea614 |
diff -rupN portmidi.old/pm_common/CMakeLists.txt portmidi/pm_common/CMakeLists.txt
|
|
|
f6ea614 |
--- portmidi.old/pm_common/CMakeLists.txt 2010-09-20 15:57:48.000000000 -0400
|
|
|
6849c37 |
+++ portmidi/pm_common/CMakeLists.txt 2011-06-23 22:35:41.000000000 -0400
|
|
|
f6ea614 |
@@ -120,8 +120,8 @@ set_target_properties(pmjni PROPERTIES E
|
|
|
272c92b |
# install the libraries (Linux and Mac OS X command line)
|
|
|
272c92b |
if(UNIX)
|
|
|
272c92b |
INSTALL(TARGETS portmidi-static pmjni
|
|
|
272c92b |
- LIBRARY DESTINATION /usr/local/lib
|
|
|
272c92b |
- ARCHIVE DESTINATION /usr/local/lib)
|
|
|
272c92b |
+ LIBRARY DESTINATION ${LIB_INSTALL_DIR}
|
|
|
272c92b |
+ ARCHIVE DESTINATION ${LIB_INSTALL_DIR})
|
|
|
272c92b |
# .h files installed by pm_dylib/CMakeLists.txt, so don't need them here
|
|
|
272c92b |
# INSTALL(FILES portmidi.h ../porttime/porttime.h
|
|
|
f6ea614 |
# DESTINATION /usr/local/include)
|
|
|
f6ea614 |
diff -rupN portmidi.old/pm_dylib/CMakeLists.txt portmidi/pm_dylib/CMakeLists.txt
|
|
|
272c92b |
--- portmidi.old/pm_dylib/CMakeLists.txt 2009-11-20 00:41:09.000000000 -0500
|
|
|
6849c37 |
+++ portmidi/pm_dylib/CMakeLists.txt 2011-06-23 22:35:41.000000000 -0400
|
|
|
272c92b |
@@ -59,7 +59,7 @@ if(UNIX)
|
|
|
9ac4231 |
|
|
|
272c92b |
set(JAVAVM_LIB "${FRAMEWORK_PATH}/JavaVM.framework")
|
|
|
272c92b |
set(JAVA_INCLUDE_PATHS ${JAVAVM_LIB}/Headers)
|
|
|
272c92b |
- set(INSTALL_NAME_DIR "/usr/local/lib")
|
|
|
272c92b |
+ set(INSTALL_NAME_DIR ${LIB_INSTALL_DIR})
|
|
|
272c92b |
message(STATUS "SYSROOT: " ${CMAKE_OSX_SYSROOT})
|
|
|
272c92b |
else(APPLE)
|
|
|
272c92b |
# LINUX settings...
|
|
|
272c92b |
@@ -75,11 +75,7 @@ if(UNIX)
|
|
|
272c92b |
# JAVA_INCLUDE_PATH2; if no, then we need to make both JAVA_INCLUDE_PATH
|
|
|
272c92b |
# and JAVA_INCLUDE_PATH2 set by user (will need clear documentation
|
|
|
272c92b |
# because JAVA_INCLUDE_PATH2 is pretty obscure)
|
|
|
272c92b |
- set(JAVA_INCLUDE_PATH ${JAVA_INCLUDE_PATH-UNKNOWN}
|
|
|
272c92b |
- CACHE STRING "where to find Java SDK include directory")
|
|
|
272c92b |
- set(JAVA_INCLUDE_PATHS ${JAVA_INCLUDE_PATH} ${JAVA_INCLUDE_PATH}/linux)
|
|
|
272c92b |
- # libjvm.so is found relative to JAVA_INCLUDE_PATH:
|
|
|
272c92b |
- set(JAVAVM_LIB ${JAVA_INCLUDE_PATH}/../jre/lib/i386/client/libjvm.so)
|
|
|
272c92b |
+ set(JAVAVM_LIB ${JAVA_JVM_LIBRARY})
|
|
|
9ac4231 |
|
|
|
272c92b |
set(LINUXSRC pmlinuxalsa pmlinux finddefault)
|
|
|
272c92b |
prepend_path(LIBSRC ../pm_linux/ ${LINUXSRC})
|
|
|
272c92b |
@@ -114,14 +110,14 @@ prepend_path(SHARED_PATHS ../pm_common/
|
|
|
272c92b |
list(APPEND LIBSRC ${SHARED_PATHS})
|
|
|
9ac4231 |
|
|
|
9ac4231 |
add_library(portmidi-dynamic SHARED ${LIBSRC})
|
|
|
9ac4231 |
-set_target_properties(portmidi-dynamic PROPERTIES OUTPUT_NAME "portmidi")
|
|
|
272c92b |
+set_target_properties(portmidi-dynamic PROPERTIES LINK_FLAGS "-L${CMAKE_CACHEFILE_DIR}/Release" SOVERSION 0 VERSION 0.${VERSION} OUTPUT_NAME "portmidi")
|
|
|
272c92b |
target_link_libraries(portmidi-dynamic ${PM_NEEDED_LIBS})
|
|
|
9ac4231 |
|
|
|
272c92b |
# install the libraries (Linux and Mac OS X command line)
|
|
|
272c92b |
if(UNIX)
|
|
|
272c92b |
INSTALL(TARGETS portmidi-dynamic
|
|
|
9ac4231 |
- LIBRARY DESTINATION /usr/local/lib
|
|
|
9ac4231 |
- ARCHIVE DESTINATION /usr/local/lib)
|
|
|
9ac4231 |
+ LIBRARY DESTINATION ${LIB_INSTALL_DIR}
|
|
|
9ac4231 |
+ ARCHIVE DESTINATION ${LIB_INSTALL_DIR})
|
|
|
272c92b |
INSTALL(FILES ../pm_common/portmidi.h ../porttime/porttime.h
|
|
|
9ac4231 |
- DESTINATION /usr/local/include)
|
|
|
9ac4231 |
+ DESTINATION ${INCLUDE_INSTALL_DIR})
|
|
|
272c92b |
endif(UNIX)
|
|
|
f6ea614 |
diff -rupN portmidi.old/pm_java/CMakeLists.txt portmidi/pm_java/CMakeLists.txt
|
|
|
272c92b |
--- portmidi.old/pm_java/CMakeLists.txt 2009-11-04 10:20:44.000000000 -0500
|
|
|
6849c37 |
+++ portmidi/pm_java/CMakeLists.txt 2011-06-23 22:35:54.000000000 -0400
|
|
|
6849c37 |
@@ -16,12 +16,12 @@ if(UNIX)
|
|
|
6849c37 |
COMMAND javac -classpath . pmdefaults/PmDefaultsFrame.java
|
|
|
6849c37 |
MAIN_DEPENDENCY pmdefaults/PmDefaultsFrame.java
|
|
|
6849c37 |
DEPENDS pmdefaults/PmDefaults.java
|
|
|
6849c37 |
- WORKING_DIRECTORY pm_java)
|
|
|
6849c37 |
+ )
|
|
|
6849c37 |
add_custom_command(OUTPUT pmdefaults/PmDefaults.class
|
|
|
6849c37 |
COMMAND javac -classpath . pmdefaults/PmDefaults.java
|
|
|
6849c37 |
MAIN_DEPENDENCY pmdefaults/PmDefaults.java
|
|
|
6849c37 |
DEPENDS pmdefaults/PmDefaultsFrame.java
|
|
|
6849c37 |
- WORKING_DIRECTORY pm_java)
|
|
|
6849c37 |
+ )
|
|
|
6849c37 |
add_custom_command(OUTPUT ${CMAKE_LIBRARY_OUTPUT_DIRECTORY}/pmdefaults.jar
|
|
|
6849c37 |
COMMAND cp pmdefaults/portmusic_logo.png .
|
|
|
6849c37 |
COMMAND jar cmf pmdefaults/manifest.txt pmdefaults.jar
|
|
|
6849c37 |
@@ -32,7 +32,7 @@ if(UNIX)
|
|
|
6849c37 |
COMMAND rm portmusic_logo.png
|
|
|
6849c37 |
MAIN_DEPENDENCY pmdefaults/PmDefaults.class
|
|
|
6849c37 |
DEPENDS ${PMDEFAULTS_ALL_CLASSES}
|
|
|
6849c37 |
- WORKING_DIRECTORY pm_java)
|
|
|
6849c37 |
+ )
|
|
|
6849c37 |
add_custom_target(pmdefaults_target ALL
|
|
|
6849c37 |
DEPENDS ${CMAKE_LIBRARY_OUTPUT_DIRECTORY}/pmdefaults.jar)
|
|
|
6849c37 |
# message(STATUS "add_custom_target: pmdefaults.jar")
|
|
|
272c92b |
@@ -41,7 +41,7 @@ if(UNIX)
|
|
|
9ac4231 |
INSTALL(FILES ${CMAKE_LIBRARY_OUTPUT_DIRECTORY}/pmdefaults.jar
|
|
|
272c92b |
DESTINATION /usr/share/java)
|
|
|
9ac4231 |
INSTALL(PROGRAMS ${CMAKE_LIBRARY_OUTPUT_DIRECTORY}/pmdefaults
|
|
|
9ac4231 |
- DESTINATION /usr/local/bin)
|
|
|
9ac4231 |
+ DESTINATION ${CMAKE_INSTALL_PREFIX}/bin)
|
|
|
9ac4231 |
endif(APPLE)
|
|
|
9ac4231 |
endif(UNIX)
|
|
|
9ac4231 |
# In windows, use pm_java/make.bat
|
|
|
f6ea614 |
diff -rupN portmidi.old/pm_test/CMakeLists.txt portmidi/pm_test/CMakeLists.txt
|
|
|
f6ea614 |
--- portmidi.old/pm_test/CMakeLists.txt 2010-09-20 15:57:48.000000000 -0400
|
|
|
6849c37 |
+++ portmidi/pm_test/CMakeLists.txt 2011-06-23 22:35:41.000000000 -0400
|
|
|
272c92b |
@@ -12,7 +12,7 @@ endif(WIN32)
|
|
|
9ac4231 |
|
|
|
9ac4231 |
macro(make_a_test name)
|
|
|
9ac4231 |
add_executable(${name} ${name}.c)
|
|
|
9ac4231 |
- target_link_libraries(${name} portmidi-static ${PM_NEEDED_LIBS})
|
|
|
f6ea614 |
+ target_link_libraries(${name} portmidi-dynamic)
|
|
|
f6ea614 |
add_dependencies(${name} portmidi-static)
|
|
|
9ac4231 |
endmacro(make_a_test)
|
|
|
9ac4231 |
|