From: <ai...@us...> - 2009-10-30 19:50:38
|
Revision: 10562 http://plplot.svn.sourceforge.net/plplot/?rev=10562&view=rev Author: airwin Date: 2009-10-30 19:50:30 +0000 (Fri, 30 Oct 2009) Log Message: ----------- Cache PLplot jar file and PLplot java plugin install locations to allow interested users a chance to modify the default values. Modified Paths: -------------- trunk/cmake/modules/java.cmake Modified: trunk/cmake/modules/java.cmake =================================================================== --- trunk/cmake/modules/java.cmake 2009-10-30 10:31:45 UTC (rev 10561) +++ trunk/cmake/modules/java.cmake 2009-10-30 19:50:30 UTC (rev 10562) @@ -81,10 +81,13 @@ if(ENABLE_java) # Set up installation locations for java specific files. # Java .jar files. - set(JAR_DIR ${CMAKE_INSTALL_DATADIR}/java) + set(JAR_DIR ${CMAKE_INSTALL_DATADIR}/java + CACHE PATH "PLplot jar file install location") get_filename_component(JAVADATA_HARDDIR ${JAR_DIR} ABSOLUTE) # JNI .so files. - set(JAVAWRAPPER_DIR ${LIB_DIR}/jni) + set(JAVAWRAPPER_DIR ${LIB_DIR}/jni + CACHE PATH "PLplot java plugin install location" + ) get_filename_component(JAVAWRAPPER_HARDDIR ${JAVAWRAPPER_DIR} ABSOLUTE) # Library name suffix is system dependent. Tests have shown # that ${CMAKE_SHARED_LIBRARY_SUFFIX} gives the correct suffix on both This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |