Gentoo Websites Logo
Go to: Gentoo Home Documentation Forums Lists Bugs Planet Store Wiki Get Gentoo!
View | Details | Raw Unified | Return to bug 90614 | Differences between
and this patch

Collapse All | Expand All

(-)portmidi-original/pm_common/CMakeLists.txt (-2 / +2 lines)
Lines 125-132 set_target_properties(pmjni PROPERTIES E Link Here
125
# install the libraries (Linux and Mac OS X command line)
125
# install the libraries (Linux and Mac OS X command line)
126
if(UNIX)
126
if(UNIX)
127
  INSTALL(TARGETS portmidi-static pmjni
127
  INSTALL(TARGETS portmidi-static pmjni
128
    LIBRARY DESTINATION /usr/local/lib
128
    LIBRARY DESTINATION /usr/lib
129
    ARCHIVE DESTINATION /usr/local/lib)
129
    ARCHIVE DESTINATION /usr/lib)
130
# .h files installed by pm_dylib/CMakeLists.txt, so don't need them here
130
# .h files installed by pm_dylib/CMakeLists.txt, so don't need them here
131
#  INSTALL(FILES portmidi.h ../porttime/porttime.h
131
#  INSTALL(FILES portmidi.h ../porttime/porttime.h
132
#    DESTINATION /usr/local/include)
132
#    DESTINATION /usr/local/include)
(-)portmidi-original/pm_dylib/CMakeLists.txt (-4 / +4 lines)
Lines 59-65 if(UNIX) Link Here
59
59
60
    set(JAVAVM_LIB "${FRAMEWORK_PATH}/JavaVM.framework")
60
    set(JAVAVM_LIB "${FRAMEWORK_PATH}/JavaVM.framework")
61
    set(JAVA_INCLUDE_PATHS ${JAVAVM_LIB}/Headers)
61
    set(JAVA_INCLUDE_PATHS ${JAVAVM_LIB}/Headers)
62
    set(INSTALL_NAME_DIR "/usr/local/lib")
62
    set(INSTALL_NAME_DIR "/usr/lib")
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...
Lines 120-127 target_link_libraries(portmidi-dynamic $ Link Here
120
# install the libraries (Linux and Mac OS X command line)
120
# install the libraries (Linux and Mac OS X command line)
121
if(UNIX)
121
if(UNIX)
122
  INSTALL(TARGETS portmidi-dynamic
122
  INSTALL(TARGETS portmidi-dynamic
123
    LIBRARY DESTINATION /usr/local/lib
123
    LIBRARY DESTINATION /usr/lib
124
    ARCHIVE DESTINATION /usr/local/lib)
124
    ARCHIVE DESTINATION /usr/lib)
125
  INSTALL(FILES ../pm_common/portmidi.h ../porttime/porttime.h
125
  INSTALL(FILES ../pm_common/portmidi.h ../porttime/porttime.h
126
    DESTINATION /usr/local/include)
126
    DESTINATION /usr/include)
127
endif(UNIX)
127
endif(UNIX)
(-)portmidi-original/pm_linux/Makefile (-1 / +1 lines)
Lines 147-153 pm_java/pmdefaults/pmdefaults.jar: $(DEF Link Here
147
	cd pm_java; chmod +x pmdefaults/pmdefaults
147
	cd pm_java; chmod +x pmdefaults/pmdefaults
148
148
149
install:
149
install:
150
	cp pm_java/pmjni/libpmjni.so /usr/local/lib
150
	cp pm_java/pmjni/libpmjni.so /usr/lib
151
	cp pm_java/pmdefaults.jar /usr/share/java
151
	cp pm_java/pmdefaults.jar /usr/share/java
152
	# do not chmod +x here since we are probably root
152
	# do not chmod +x here since we are probably root
153
	cp pm_java/pmdefaults/pmdefaults /usr/local/bin
153
	cp pm_java/pmdefaults/pmdefaults /usr/local/bin

Return to bug 90614