[cmake-commits] king committed CMakeJavaCompiler.cmake.in 1.11 1.12

cmake-commits at cmake.org cmake-commits at cmake.org
Mon Jan 7 16:12:39 EST 2008


Update of /cvsroot/CMake/CMake/Modules
In directory public:/mounts/ram/cvs-serv28417/Modules

Modified Files:
	CMakeJavaCompiler.cmake.in 
Log Message:
BUG: Restore old interface of "make foo.o" and "make foo.i" even though object file names now include source extensions.  For Java we also need to always remove the source extension (.java -> .class).  This fixes the re-opening of bug #6169.


Index: CMakeJavaCompiler.cmake.in
===================================================================
RCS file: /cvsroot/CMake/CMake/Modules/CMakeJavaCompiler.cmake.in,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -d -r1.11 -r1.12
--- CMakeJavaCompiler.cmake.in	12 Jul 2007 12:37:10 -0000	1.11
+++ CMakeJavaCompiler.cmake.in	7 Jan 2008 21:12:36 -0000	1.12
@@ -7,6 +7,7 @@
 SET(CMAKE_Java_SOURCE_FILE_EXTENSIONS java)
 SET(CMAKE_Java_LINKER_PREFERENCE 40)
 SET(CMAKE_Java_OUTPUT_EXTENSION .class)
+SET(CMAKE_Java_OUTPUT_EXTENSION_REPLACE 1)
 SET(CMAKE_STATIC_LIBRARY_PREFIX_Java "")
 SET(CMAKE_STATIC_LIBRARY_SUFFIX_Java ".jar")
 SET(CMAKE_Java_COMPILER_ENV_VAR "JAVA_COMPILER")



More information about the Cmake-commits mailing list