summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMathieu Malaterre <mathieu.malaterre@gmail.com>2012-04-19 12:40:28 +0000
committerMathieu Malaterre <mathieu.malaterre@gmail.com>2012-04-19 12:40:28 +0000
commit65f8ae765ee8a5bceec442641209658bef17da83 (patch)
tree09cf7993ca9a87241a0260707966447e3e10b010
parent3aba3e203b728a8849e4d984af2c875f07a51616 (diff)
[1.5] jar files are arch independant. We can install them safely in share
-rw-r--r--applications/JavaOpenJPEG/CMakeLists.txt2
-rw-r--r--applications/jpip/util/CMakeLists.txt4
2 files changed, 3 insertions, 3 deletions
diff --git a/applications/JavaOpenJPEG/CMakeLists.txt b/applications/JavaOpenJPEG/CMakeLists.txt
index 78d6146c..3891822e 100644
--- a/applications/JavaOpenJPEG/CMakeLists.txt
+++ b/applications/JavaOpenJPEG/CMakeLists.txt
@@ -63,5 +63,5 @@ ADD_CUSTOM_TARGET(OpenJPEGJavaJar ALL
)
INSTALL(FILES ${LIBRARY_OUTPUT_PATH}/openjpeg.jar
- DESTINATION ${OPENJPEG_INSTALL_LIB_DIR} COMPONENT JavaModule
+ DESTINATION ${OPENJPEG_INSTALL_SHARE_DIR} COMPONENT JavaModule
)
diff --git a/applications/jpip/util/CMakeLists.txt b/applications/jpip/util/CMakeLists.txt
index d4a55c40..060d3c98 100644
--- a/applications/jpip/util/CMakeLists.txt
+++ b/applications/jpip/util/CMakeLists.txt
@@ -78,7 +78,7 @@ if(Java_Development_FOUND AND Java_JAVAC_EXECUTABLE)
)
INSTALL(FILES ${LIBRARY_OUTPUT_PATH}/opj_viewer.jar
- DESTINATION ${OPENJPEG_INSTALL_LIB_DIR} COMPONENT JavaModule
+ DESTINATION ${OPENJPEG_INSTALL_SHARE_DIR} COMPONENT JavaModule
)
# 2. opj_viewer_xerces
@@ -133,7 +133,7 @@ if(Java_Development_FOUND AND Java_JAVAC_EXECUTABLE)
)
INSTALL(FILES ${LIBRARY_OUTPUT_PATH}/opj_viewer_xerces.jar
- DESTINATION ${OPENJPEG_INSTALL_LIB_DIR} COMPONENT JavaModule
+ DESTINATION ${OPENJPEG_INSTALL_SHARE_DIR} COMPONENT JavaModule
)
endif()
else(Java_Development_FOUND)