diff options
| author | Mathieu Malaterre <mathieu.malaterre@gmail.com> | 2012-10-22 11:29:32 +0000 |
|---|---|---|
| committer | Mathieu Malaterre <mathieu.malaterre@gmail.com> | 2012-10-22 11:29:32 +0000 |
| commit | 15488c94d2d3ffd4364b4d1c3991d23466a437c2 (patch) | |
| tree | 7b24ef05b22cd1f3e96736f9cddd8c4fa13bb427 /applications/JavaOpenJPEG | |
| parent | 75175b715c1f53843237805995939cad69b649e4 (diff) | |
[1.5] Fix Java binding issues.
Properly link to math lib on UNIX
Make JNI install location a user configuration
Remove SONAME property from the java module
Diffstat (limited to 'applications/JavaOpenJPEG')
| -rw-r--r-- | applications/JavaOpenJPEG/CMakeLists.txt | 11 |
1 files changed, 6 insertions, 5 deletions
diff --git a/applications/JavaOpenJPEG/CMakeLists.txt b/applications/JavaOpenJPEG/CMakeLists.txt index 3891822e..477ba749 100644 --- a/applications/JavaOpenJPEG/CMakeLists.txt +++ b/applications/JavaOpenJPEG/CMakeLists.txt @@ -24,13 +24,14 @@ include_directories( add_library(openjpegjni MODULE ${openjpegjni_SRCS} ) +# Java module should not have a SONAME: +set_property(TARGET openjpegjni PROPERTY NO_SONAME 1) + TARGET_LINK_LIBRARIES(openjpegjni ${OPENJPEG_LIBRARY_NAME}) -IF(WIN32) - SET(OPENJPEG_INSTALL_JNI_DIR ${OPENJPEG_INSTALL_BIN_DIR}) -ELSE() - SET(OPENJPEG_INSTALL_JNI_DIR ${OPENJPEG_INSTALL_LIB_DIR}) -ENDIF() +if(UNIX) + target_link_libraries(openjpegjni m) +endif() INSTALL(TARGETS openjpegjni EXPORT OpenJPEGTargets |