logo

overlay

My own overlay for experimentations, use with caution, no support is provided git clone https://hacktivis.me/git/overlay.git

portmidi-217-cmake.patch (13905B)

    

  1. diff --git a/CMakeLists.txt b/CMakeLists.txt
  2. index 4919b78..9dc6e58 100644
  3. --- a/CMakeLists.txt
  4. +++ b/CMakeLists.txt
  5. @@ -9,12 +9,11 @@ if(UNIX)
  6.    set(CMAKE_BUILD_TYPE Release CACHE STRING 
  7.        "Semicolon-separate list of supported configuration types")
  8.    # set default directories but don't override cached values...
  9. -  set(CMAKE_LIBRARY_OUTPUT_DIRECTORY ${CMAKE_CACHEFILE_DIR}/${CMAKE_BUILD_TYPE}
  10. +  set(CMAKE_LIBRARY_OUTPUT_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}
  11.        CACHE STRING "libraries go here")
  12. -  set(CMAKE_ARCHIVE_OUTPUT_DIRECTORY ${CMAKE_CACHEFILE_DIR}/${CMAKE_BUILD_TYPE}
  13. +  set(CMAKE_ARCHIVE_OUTPUT_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}
  14.        CACHE STRING "libraries go here")
  15. -  set(CMAKE_RUNTIME_OUTPUT_DIRECTORY 
  16. -      ${CMAKE_CACHEFILE_DIR}/${CMAKE_BUILD_TYPE}
  17. +  set(CMAKE_RUNTIME_OUTPUT_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}
  18.        CACHE STRING "executables go here")
  19.  
  20.  else(UNIX)
  21. @@ -68,10 +67,20 @@ endif(UNIX)
  22.  include_directories(pm_common porttime)
  23.  add_subdirectory(pm_common)
  24.  
  25. -add_subdirectory(pm_test)
  26. +option(PORTMIDI_ENABLE_JAVA "Enable Java bindings support" ON)
  27. +option(PORTMIDI_ENABLE_STATIC "Build and install static libraries" OFF)
  28. +option(PORTMIDI_ENABLE_TEST "Build test programs" ON)
  29. +
  30. +if(PORTMIDI_ENABLE_TEST)
  31. +  add_subdirectory(pm_test)
  32. +endif(PORTMIDI_ENABLE_TEST)
  33.  
  34.  add_subdirectory(pm_dylib)
  35.  
  36.  # Cannot figure out how to make an xcode Java application with CMake
  37. -add_subdirectory(pm_java)
  38. +if(PORTMIDI_ENABLE_JAVA)
  39. +  set(JAR_INSTALL_DIR share/java
  40. +      CACHE STRING "Define directory name for jar installation")
  41. +  add_subdirectory(pm_java)
  42. +endif(PORTMIDI_ENABLE_JAVA)
  43.  
  44. diff --git a/pm_common/CMakeLists.txt b/pm_common/CMakeLists.txt
  45. index e171047..d23442d 100644
  46. --- a/pm_common/CMakeLists.txt
  47. +++ b/pm_common/CMakeLists.txt
  48. @@ -44,9 +44,6 @@ set(CMAKE_C_FLAGS_RELEASE "${DEFAULT_RELEASE_FLAGS} ${LINUX_FLAGS}"
  49.  
  50.  # first include the appropriate system-dependent file:
  51.  if(UNIX)
  52. -  # add the -g switch for Linux and Mac OS X (not used in Win32)
  53. -  set (CMAKE_C_FLAGS_DEBUG "-g ${CMAKE_C_FLAGS_DEBUG}" 
  54. -       CACHE STRING "enable extra checks for debugging" FORCE)
  55.    if(APPLE)
  56.      set(MACSRC pmmacosxcm pmmac readbinaryplist finddefault)
  57.      prepend_path(LIBSRC ../pm_mac/ ${MACSRC})
  58. @@ -62,19 +59,23 @@ if(UNIX)
  59.                               ${COREMIDI_LIB} ${CORESERVICES_LIB}
  60.          CACHE INTERNAL "")
  61.  
  62. -    set(JAVAVM_LIB "${FRAMEWORK_PATH}/JavaVM.framework")
  63. -    set(JAVA_INCLUDE_PATHS ${JAVAVM_LIB}/Headers)
  64. +    if(PORTMIDI_ENABLE_JAVA)
  65. +      set(JAVAVM_LIB "${FRAMEWORK_PATH}/JavaVM.framework")
  66. +      set(JAVA_INCLUDE_PATHS ${JAVAVM_LIB}/Headers)
  67. +    endif(PORTMIDI_ENABLE_JAVA)
  68.      message(STATUS "SYSROOT: " ${CMAKE_OSX_SYSROOT})
  69.    else(APPLE)
  70.      # LINUX settings...
  71. -    include(FindJNI)
  72. -    message(STATUS "JAVA_JVM_LIB_PATH is " ${JAVA_JVM_LIB_PATH})
  73. -    message(STATUS "JAVA_INCLUDE_PATH is " ${JAVA_INCLUDE_PATH})
  74. -    message(STATUS "JAVA_INCLUDE_PATH2 is " ${JAVA_INCLUDE_PATH2})
  75. -    message(STATUS "JAVA_JVM_LIBRARY is " ${JAVA_JVM_LIBRARY})
  76. -    set(JAVA_INCLUDE_PATHS ${JAVA_INCLUDE_PATH} ${JAVA_INCLUDE_PATH2})
  77. -    # libjvm.so is found relative to JAVA_INCLUDE_PATH:
  78. -    set(JAVAVM_LIB ${JAVA_JVM_LIBRARY}/libjvm.so)
  79. +    if(PORTMIDI_ENABLE_JAVA)
  80. +      include(FindJNI)
  81. +      message(STATUS "JAVA_JVM_LIB_PATH is " ${JAVA_JVM_LIB_PATH})
  82. +      message(STATUS "JAVA_INCLUDE_PATH is " ${JAVA_INCLUDE_PATH})
  83. +      message(STATUS "JAVA_INCLUDE_PATH2 is " ${JAVA_INCLUDE_PATH2})
  84. +      message(STATUS "JAVA_JVM_LIBRARY is " ${JAVA_JVM_LIBRARY})
  85. +      set(JAVA_INCLUDE_PATHS ${JAVA_INCLUDE_PATH} ${JAVA_INCLUDE_PATH2})
  86. +      # libjvm.so is found relative to JAVA_INCLUDE_PATH:
  87. +      set(JAVAVM_LIB ${JAVA_JVM_LIBRARY}/libjvm.so)
  88. +    endif(PORTMIDI_ENABLE_JAVA)
  89.  
  90.      set(LINUXSRC pmlinuxalsa pmlinux finddefault)
  91.      prepend_path(LIBSRC ../pm_linux/ ${LINUXSRC})
  92. @@ -88,10 +89,12 @@ else(UNIX)
  93.      # /MD is multithread DLL, /MT is multithread. Change to static:
  94.      include(../pm_win/static.cmake)
  95.      
  96. -    include(FindJNI)
  97. +    if(PORTMIDI_ENABLE_JAVA)
  98. +      include(FindJNI)
  99.  
  100. -    set(JAVA_INCLUDE_PATHS ${JAVA_INCLUDE_PATH} ${JAVA_INCLUDE_PATH2})
  101. -    # message(STATUS "JAVA_INCLUDE_PATHS: " ${JAVA_INCLUDE_PATHS})
  102. +      set(JAVA_INCLUDE_PATHS ${JAVA_INCLUDE_PATH} ${JAVA_INCLUDE_PATH2})
  103. +      # message(STATUS "JAVA_INCLUDE_PATHS: " ${JAVA_INCLUDE_PATHS})
  104. +    endif(PORTMIDI_ENABLE_JAVA)
  105.  
  106.      set(WINSRC pmwin pmwinmm)
  107.      prepend_path(LIBSRC ../pm_win/ ${WINSRC})
  108. @@ -99,29 +102,43 @@ else(UNIX)
  109.      set(PM_NEEDED_LIBS winmm.lib)
  110.    endif(WIN32)
  111.  endif(UNIX)
  112. -set(JNI_EXTRA_LIBS ${PM_NEEDED_LIBS} ${JAVA_JVM_LIBRARY})
  113. +
  114. +if(PORTMIDI_ENABLE_JAVA)
  115. +  set(JNI_EXTRA_LIBS ${PM_NEEDED_LIBS} ${JAVA_JVM_LIBRARY})
  116. +endif(PORTMIDI_ENABLE_JAVA)
  117.  
  118.  # this completes the list of library sources by adding shared code
  119.  list(APPEND LIBSRC pmutil portmidi)
  120.  
  121.  # now add the shared files to make the complete list of library sources
  122. -add_library(portmidi-static ${LIBSRC})
  123. -set_target_properties(portmidi-static PROPERTIES OUTPUT_NAME "portmidi_s")
  124. -target_link_libraries(portmidi-static ${PM_NEEDED_LIBS})
  125. -
  126. -# define the jni library
  127. -include_directories(${JAVA_INCLUDE_PATHS})
  128. -
  129. -set(JNISRC ${LIBSRC} ../pm_java/pmjni/pmjni.c)
  130. -add_library(pmjni SHARED ${JNISRC})
  131. -target_link_libraries(pmjni ${JNI_EXTRA_LIBS})
  132. -set_target_properties(pmjni PROPERTIES EXECUTABLE_EXTENSION "jnilib")
  133. +if(PORTMIDI_ENABLE_STATIC)
  134. +  add_library(portmidi-static ${LIBSRC})
  135. +  set_target_properties(portmidi-static PROPERTIES OUTPUT_NAME "portmidi")
  136. +  target_link_libraries(portmidi-static ${PM_NEEDED_LIBS})
  137. +endif(PORTMIDI_ENABLE_STATIC)
  138. +
  139. +if(PORTMIDI_ENABLE_JAVA)
  140. +  # define the jni library
  141. +  include_directories(${JAVA_INCLUDE_PATHS})
  142. +
  143. +  set(JNISRC ${LIBSRC} ../pm_java/pmjni/pmjni.c)
  144. +  add_library(pmjni SHARED ${JNISRC})
  145. +  target_link_libraries(pmjni ${JNI_EXTRA_LIBS})
  146. +  set_target_properties(pmjni PROPERTIES EXECUTABLE_EXTENSION "jnilib")
  147. +endif(PORTMIDI_ENABLE_JAVA)
  148.  
  149.  # install the libraries (Linux and Mac OS X command line)
  150.  if(UNIX)
  151. -  INSTALL(TARGETS portmidi-static pmjni
  152. -    LIBRARY DESTINATION /usr/local/lib
  153. -    ARCHIVE DESTINATION /usr/local/lib)
  154. +  if(PORTMIDI_ENABLE_STATIC)
  155. +    INSTALL(TARGETS portmidi-static
  156. +      LIBRARY DESTINATION lib${LIB_SUFFIX}
  157. +      ARCHIVE DESTINATION lib${LIB_SUFFIX})
  158. +  endif(PORTMIDI_ENABLE_STATIC)
  159. +  if(PORTMIDI_ENABLE_JAVA)
  160. +    INSTALL(TARGETS pmjni
  161. +      LIBRARY DESTINATION lib${LIB_SUFFIX}
  162. +      ARCHIVE DESTINATION lib${LIB_SUFFIX})
  163. +  endif(PORTMIDI_ENABLE_JAVA)
  164.  # .h files installed by pm_dylib/CMakeLists.txt, so don't need them here
  165.  #  INSTALL(FILES portmidi.h ../porttime/porttime.h
  166.  #    DESTINATION /usr/local/include)
  167. diff --git a/pm_dylib/CMakeLists.txt b/pm_dylib/CMakeLists.txt
  168. index f693dd6..c0e1449 100644
  169. --- a/pm_dylib/CMakeLists.txt
  170. +++ b/pm_dylib/CMakeLists.txt
  171. @@ -39,9 +39,6 @@ set(CMAKE_C_FLAGS_RELEASE "${DEFAULT_RELEASE_FLAGS} ${LINUX_FLAGS}"
  172.  
  173.  # first include the appropriate system-dependent file:
  174.  if(UNIX)
  175. -  # add the -g switch for Linux and Mac OS X (not used in Win32)
  176. -  set (CMAKE_C_FLAGS_DEBUG "-g ${CMAKE_C_FLAGS_DEBUG}" 
  177. -       CACHE STRING "enable extra checks for debugging" FORCE)
  178.    if(APPLE)
  179.      set(MACSRC pmmacosxcm pmmac readbinaryplist finddefault)
  180.      prepend_path(LIBSRC ../pm_mac/ ${MACSRC})
  181. @@ -63,7 +60,8 @@ if(UNIX)
  182.      message(STATUS "SYSROOT: " ${CMAKE_OSX_SYSROOT})
  183.    else(APPLE)
  184.      # LINUX settings...
  185. -    include(FindJNI)
  186. +    if(PORTMIDI_ENABLE_JAVA)
  187. +      include(FindJNI)
  188.      # message(STATUS "JAVA_JVM_LIB_PATH is " ${JAVA_JVM_LIB_PATH})
  189.      # message(STATUS "JAVA_INCLUDE_PATH is " ${JAVA_INCLUDE_PATH})
  190.      # note: should use JAVA_JVM_LIB_PATH, but it is not set properly
  191. @@ -75,11 +73,8 @@ if(UNIX)
  192.      # JAVA_INCLUDE_PATH2; if no, then we need to make both JAVA_INCLUDE_PATH
  193.      # and JAVA_INCLUDE_PATH2 set by user (will need clear documentation
  194.      # because JAVA_INCLUDE_PATH2 is pretty obscure)
  195. -    set(JAVA_INCLUDE_PATH  ${JAVA_INCLUDE_PATH-UNKNOWN}
  196. -        CACHE STRING "where to find Java SDK include directory")
  197. -    set(JAVA_INCLUDE_PATHS ${JAVA_INCLUDE_PATH} ${JAVA_INCLUDE_PATH}/linux)
  198. -    # libjvm.so is found relative to JAVA_INCLUDE_PATH:
  199. -    set(JAVAVM_LIB ${JAVA_INCLUDE_PATH}/../jre/lib/i386/client/libjvm.so)
  200. +      set(JAVAVM_LIB ${JAVA_JVM_LIBRARY})
  201. +    endif(PORTMIDI_ENABLE_JAVA)
  202.  
  203.      set(LINUXSRC pmlinuxalsa pmlinux finddefault)
  204.      prepend_path(LIBSRC ../pm_linux/ ${LINUXSRC})
  205. @@ -91,13 +86,15 @@ else(UNIX)
  206.    if(WIN32)
  207.      # /MDd is multithread debug DLL, /MTd is multithread debug
  208.      # /MD is multithread DLL, /MT is multithread 
  209. -    
  210. -    include(FindJNI)
  211. -    # note: should use JAVA_JVM_LIB_PATH, but it is not set properly
  212. -    set(JAVAVM_LIB ${JAVA_INCLUDE_PATH}/../lib/jvm.lib)
  213.  
  214. -    set(JAVA_INCLUDE_PATHS ${JAVA_INCLUDE_PATH} ${JAVA_INCLUDE_PATH2})
  215. -    # message(STATUS "JAVA_INCLUDE_PATHS: " ${JAVA_INCLUDE_PATHS})
  216. +    if(PORTMIDI_ENABLE_JAVA)
  217. +      include(FindJNI)
  218. +      # note: should use JAVA_JVM_LIB_PATH, but it is not set properly
  219. +      set(JAVAVM_LIB ${JAVA_INCLUDE_PATH}/../lib/jvm.lib)
  220. +
  221. +      set(JAVA_INCLUDE_PATHS ${JAVA_INCLUDE_PATH} ${JAVA_INCLUDE_PATH2})
  222. +      # message(STATUS "JAVA_INCLUDE_PATHS: " ${JAVA_INCLUDE_PATHS})
  223. +    endif(PORTMIDI_ENABLE_JAVA)
  224.  
  225.      set(WINSRC pmwin pmwinmm)
  226.      prepend_path(LIBSRC ../pm_win/ ${WINSRC})
  227. @@ -106,7 +103,10 @@ else(UNIX)
  228.      # message(STATUS "JAVAVM_LIB: " ${JAVAVM_LIB})
  229.    endif(WIN32)
  230.  endif(UNIX)
  231. +
  232. +if(PORTMIDI_ENABLE_JAVA)
  233.  set(JNI_EXTRA_LIBS ${PM_NEEDED_LIBS} ${JAVAVM_LIB})
  234. +endif(PORTMIDI_ENABLE_JAVA)
  235.  
  236.  # this completes the list of library sources by adding shared code
  237.  set(SHARED_FILES pmutil portmidi)
  238. @@ -120,8 +120,8 @@ target_link_libraries(portmidi-dynamic ${PM_NEEDED_LIBS})
  239.  # install the libraries (Linux and Mac OS X command line)
  240.  if(UNIX)
  241.    INSTALL(TARGETS portmidi-dynamic
  242. -    LIBRARY DESTINATION /usr/local/lib
  243. -    ARCHIVE DESTINATION /usr/local/lib)
  244. +    LIBRARY DESTINATION lib${LIB_SUFFIX}
  245. +    ARCHIVE DESTINATION lib${LIB_SUFFIX})
  246.    INSTALL(FILES ../pm_common/portmidi.h ../porttime/porttime.h
  247. -    DESTINATION /usr/local/include)
  248. +    DESTINATION include)
  249.  endif(UNIX)
  250. diff --git a/pm_java/CMakeLists.txt b/pm_java/CMakeLists.txt
  251. index a350620..9cbee1c 100644
  252. --- a/pm_java/CMakeLists.txt
  253. +++ b/pm_java/CMakeLists.txt
  254. @@ -5,43 +5,24 @@ if(UNIX)
  255.      # java not dealt with in CMake -- see pm_mac/pm_mac.xcodeproj
  256.    else(APPLE)
  257.      # linux
  258. -    set(JPORTMIDICLASS JPortMidi.class JPortMidiException.class
  259. -    		       JPortMidiApi.class)
  260. -    set(PMDEFAULTSCLASS PmDefaultsFrame.class PmDefaults.class)
  261. -    prepend_path(JPORTMIDICLASS2 jportmidi/ ${JPORTMIDICLASS})
  262. -    prepend_path(PMDEFAULTSCLASS2 pmdefaults/ ${PMDEFAULTSCLASS})
  263. -    set(PMDEFAULTS_ALL_CLASSES ${JPORTMIDICLASS2} ${PMDEFAULTSCLASS2})
  264. -    # message(STATUS "PMDEFAULTS_ALL_CLASSES is " ${PMDEFAULTS_ALL_CLASSES})
  265. -    add_custom_command(OUTPUT pmdefaults/PmDefaultsFrame.class
  266. -        COMMAND javac -classpath . pmdefaults/PmDefaultsFrame.java
  267. -	MAIN_DEPENDENCY pmdefaults/PmDefaultsFrame.java
  268. -	DEPENDS pmdefaults/PmDefaults.java
  269. -	WORKING_DIRECTORY pm_java)
  270. -    add_custom_command(OUTPUT pmdefaults/PmDefaults.class
  271. -        COMMAND javac -classpath . pmdefaults/PmDefaults.java
  272. -	MAIN_DEPENDENCY pmdefaults/PmDefaults.java
  273. -	DEPENDS pmdefaults/PmDefaultsFrame.java
  274. -	WORKING_DIRECTORY pm_java)
  275. -    add_custom_command(OUTPUT ${CMAKE_LIBRARY_OUTPUT_DIRECTORY}/pmdefaults.jar
  276. -        COMMAND	cp pmdefaults/portmusic_logo.png .
  277. -        COMMAND	jar cmf pmdefaults/manifest.txt pmdefaults.jar
  278. -		pmdefaults/*.class portmusic_logo.png jportmidi/*.class
  279. -  	COMMAND chmod +x pmdefaults/pmdefaults
  280. -	COMMAND cp pmdefaults/pmdefaults ${CMAKE_LIBRARY_OUTPUT_DIRECTORY}
  281. -	COMMAND mv pmdefaults.jar ${CMAKE_LIBRARY_OUTPUT_DIRECTORY}
  282. -	COMMAND rm portmusic_logo.png
  283. -	MAIN_DEPENDENCY pmdefaults/PmDefaults.class
  284. -	DEPENDS ${PMDEFAULTS_ALL_CLASSES}
  285. -	WORKING_DIRECTORY pm_java)
  286. -    add_custom_target(pmdefaults_target ALL 
  287. -        DEPENDS ${CMAKE_LIBRARY_OUTPUT_DIRECTORY}/pmdefaults.jar)
  288. -    # message(STATUS "add_custom_target: pmdefaults.jar")
  289. +	set(JAVA_CLASSES jportmidi pmdefaults)
  290. +	add_custom_command(OUTPUT ${JAVA_CLASSES}
  291. +		COMMAND javac -d ${CMAKE_CURRENT_BINARY_DIR} jportmidi/*.java pmdefaults/*.java
  292. +		WORKING_DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR})
  293. +	add_custom_command(OUTPUT ${CMAKE_CURRENT_BINARY_DIR}/pmdefaults.jar
  294. +		DEPENDS ${JAVA_CLASSES}
  295. +		COMMAND jar cmf pmdefaults/manifest.txt ${CMAKE_CURRENT_BINARY_DIR}/pmdefaults.jar
  296. +		-C pmdefaults portmusic_logo.png -C ${CMAKE_CURRENT_BINARY_DIR} jportmidi
  297. +		-C ${CMAKE_CURRENT_BINARY_DIR} pmdefaults
  298. +		WORKING_DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR})
  299. +	add_custom_target(pmdefaults.jar ALL
  300. +		DEPENDS ${CMAKE_CURRENT_BINARY_DIR}/pmdefaults.jar)
  301.  
  302.      # install the libraries (Linux only)
  303. -    INSTALL(FILES ${CMAKE_LIBRARY_OUTPUT_DIRECTORY}/pmdefaults.jar
  304. -      DESTINATION /usr/share/java)
  305. -    INSTALL(PROGRAMS ${CMAKE_LIBRARY_OUTPUT_DIRECTORY}/pmdefaults
  306. -      DESTINATION /usr/local/bin)
  307. +    INSTALL(FILES ${CMAKE_CURRENT_BINARY_DIR}/pmdefaults.jar
  308. +      DESTINATION ${JAR_INSTALL_DIR})
  309. +    INSTALL(PROGRAMS ${CMAKE_CURRENT_SOURCE_DIR}/pmdefaults/pmdefaults
  310. +      DESTINATION bin)
  311.    endif(APPLE)
  312.  endif(UNIX)
  313.  # In windows, use pm_java/make.bat
  314. diff --git a/pm_test/CMakeLists.txt b/pm_test/CMakeLists.txt
  315. index b89074b..236ff49 100644
  316. --- a/pm_test/CMakeLists.txt
  317. +++ b/pm_test/CMakeLists.txt
  318. @@ -10,10 +10,12 @@ if(WIN32)
  319.  include(../pm_win/static.cmake)
  320.  endif(WIN32)
  321.  
  322. +set(CMAKE_SKIP_BUILD_RPATH TRUE)
  323. +
  324.  macro(make_a_test name)
  325.    add_executable(${name} ${name}.c)
  326. -  target_link_libraries(${name} portmidi-static ${PM_NEEDED_LIBS})
  327. -  add_dependencies(${name} portmidi-static)
  328. +  target_link_libraries(${name} portmidi-dynamic ${PM_NEEDED_LIBS})
  329. +  add_dependencies(${name} portmidi-dynamic)
  330.  endmacro(make_a_test)
  331.  
  332.  make_a_test(test)