[Cmake-commits] [cmake-commits] david.cole committed CMakeJavaInformation.cmake 1.7 1.8

[cmake-commits at cmake.org]

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

Modified Files:
	CMakeJavaInformation.cmake 
Log Message:
BUG: Fix the Java test for Visual Studio builds. Before this, it had been trying to include "BuildLog.htm" in the .jar file because it was using "." as the list of files to include in the .jar file. Use "*.class" instead of "." to prevent this silliness.


Index: CMakeJavaInformation.cmake
===================================================================
RCS file: /cvsroot/CMake/CMake/Modules/CMakeJavaInformation.cmake,v
retrieving revision 1.7
retrieving revision 1.8
diff -C 2 -d -r1.7 -r1.8
*** CMakeJavaInformation.cmake	17 Apr 2006 18:00:15 -0000	1.7
--- CMakeJavaInformation.cmake	13 Mar 2008 18:29:26 -0000	1.8
***************
*** 16,23 ****
  IF(NOT CMAKE_Java_CREATE_STATIC_LIBRARY)
    SET(CMAKE_Java_CREATE_STATIC_LIBRARY
!       "<CMAKE_Java_ARCHIVE> -cf <TARGET> -C <OBJECT_DIR> .") 
! # should be this <OBJECTS> but compling a java file can create more than one .class file
! # so for now get all of them
  ENDIF(NOT CMAKE_Java_CREATE_STATIC_LIBRARY)
  # compile a Java file into an object file
  IF(NOT CMAKE_Java_COMPILE_OBJECT)
--- 16,24 ----
  IF(NOT CMAKE_Java_CREATE_STATIC_LIBRARY)
    SET(CMAKE_Java_CREATE_STATIC_LIBRARY
!       "<CMAKE_Java_ARCHIVE> -cf <TARGET> -C <OBJECT_DIR> *.class")
!   # "*.class" should really be "<OBJECTS>" but compling a java file can create
!   # more than one .class file, so for now get all of them
  ENDIF(NOT CMAKE_Java_CREATE_STATIC_LIBRARY)
+ 
  # compile a Java file into an object file
  IF(NOT CMAKE_Java_COMPILE_OBJECT)