[Plplot-cvs] SF.net SVN: plplot:[12575] trunk

[<and...@us...>]

Revision: 12575
          http://sourceforge.net/p/plplot/code/12575
Author:   andrewross
Date:     2013-10-03 21:19:46 +0000 (Thu, 03 Oct 2013)
Log Message:
-----------
Allow the cmake JAVACFLAGS variable to be set to include additional command line options for javac. 

Modified Paths:
--------------
    trunk/bindings/java/CMakeLists.txt
    trunk/cmake/modules/java.cmake
    trunk/examples/java/CMakeLists.txt

Modified: trunk/bindings/java/CMakeLists.txt
===================================================================
--- trunk/bindings/java/CMakeLists.txt	2013-10-03 08:19:31 UTC (rev 12574)
+++ trunk/bindings/java/CMakeLists.txt	2013-10-03 21:19:46 UTC (rev 12575)
@@ -200,8 +200,9 @@
     add_custom_command(
       OUTPUT ${output_file}
       COMMAND ${CMAKE_Java_COMPILER} 
-      -classpath ${CMAKE_CURRENT_BINARY_DIR} ${srcfile} -d ${CMAKE_CURRENT_BINARY_DIR}
+      ${JAVACFLAGS} -classpath ${CMAKE_CURRENT_BINARY_DIR} ${srcfile} -d ${CMAKE_CURRENT_BINARY_DIR}
       DEPENDS ${srcfile} ${${output_file}_DEPENDS}
+      VERBATIM
       )
   endforeach( srcfile ${JAVA_FILES_FULL} )
   add_custom_target(plplot_core ALL DEPENDS ${JAVA_CLASSES})

Modified: trunk/cmake/modules/java.cmake
===================================================================
--- trunk/cmake/modules/java.cmake	2013-10-03 08:19:31 UTC (rev 12574)
+++ trunk/cmake/modules/java.cmake	2013-10-03 21:19:46 UTC (rev 12575)
@@ -96,3 +96,8 @@
   # it appears this CMake variable is defined on Mac OS X and other platforms.
   set(PLPLOTJAVAC_WRAP_DLL plplotjavac_wrap${CMAKE_SHARED_LIBRARY_SUFFIX})
 endif(ENABLE_java)
+
+# Set up java compiler flags and turn into a list suitable for add_custom_command
+set(DEFAULT_JAVACFLAGS "")
+set(JAVACFLAGS ${DEFAULT_JAVACFLAGS} CACHE STRING "Java compiler flags")
+string(REGEX REPLACE " " ";" JAVACFLAGS "${JAVACFLAGS}")

Modified: trunk/examples/java/CMakeLists.txt
===================================================================
--- trunk/examples/java/CMakeLists.txt	2013-10-03 08:19:31 UTC (rev 12574)
+++ trunk/examples/java/CMakeLists.txt	2013-10-03 21:19:46 UTC (rev 12575)
@@ -101,8 +101,9 @@
     add_custom_command(
       OUTPUT ${out_file}
       COMMAND ${CMAKE_Java_COMPILER}
-      -classpath ${CMAKE_BINARY_DIR}/bindings/java -d ${CMAKE_CURRENT_BINARY_DIR} -encoding UTF-8 ${in_file}
+      ${JAVACFLAGS} -classpath ${CMAKE_BINARY_DIR}/bindings/java -d ${CMAKE_CURRENT_BINARY_DIR} -encoding UTF-8 ${in_file}
       DEPENDS ${in_file} ${files_plplot_core}
+      VERBATIM
       )
     add_custom_target(x${STRING_INDEX}j ALL DEPENDS ${out_file})
     add_dependencies(x${STRING_INDEX}j plplot_core)
@@ -160,8 +161,9 @@
     add_custom_command(
       OUTPUT ${out_file}
       COMMAND ${CMAKE_Java_COMPILER}
-      -classpath ${INSTALLED_JAR_FILE} -d ${CMAKE_CURRENT_BINARY_DIR} -encoding UTF-8 ${in_file}
+      ${JAVACFLAGS} -classpath ${INSTALLED_JAR_FILE} -d ${CMAKE_CURRENT_BINARY_DIR} -encoding UTF-8 ${in_file}
       DEPENDS ${in_file} ${INSTALLED_JAR_FILE}
+      VERBATIM
       )
     add_custom_target(x${STRING_INDEX}j ALL DEPENDS ${out_file})
     set_property(GLOBAL APPEND PROPERTY TARGETS_examples_java x${STRING_INDEX}j)

This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.