From 65f8ae765ee8a5bceec442641209658bef17da83 Mon Sep 17 00:00:00 2001 From: Mathieu Malaterre Date: Thu, 19 Apr 2012 12:40:28 +0000 Subject: [PATCH] [1.5] jar files are arch independant. We can install them safely in share --- applications/JavaOpenJPEG/CMakeLists.txt | 2 +- applications/jpip/util/CMakeLists.txt | 4 ++-- 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)