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

[cmake-commits at cmake.org]

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

Modified Files:
	CMakeJavaInformation.cmake 
Log Message:
COMP: Conditionalize the last change so that the fix only applies to WIN32. Leave it the way it was elsewhere, the new way does not work on the Mac continuous dashboard...


Index: CMakeJavaInformation.cmake
===================================================================
RCS file: /cvsroot/CMake/CMake/Modules/CMakeJavaInformation.cmake,v
retrieving revision 1.8
retrieving revision 1.9
diff -C 2 -d -r1.8 -r1.9
*** CMakeJavaInformation.cmake	13 Mar 2008 18:29:26 -0000	1.8
--- CMakeJavaInformation.cmake	13 Mar 2008 19:03:20 -0000	1.9
***************
*** 15,22 ****
  # this is a place holder if java needed flags for javac they would go here.
  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)
  
--- 15,28 ----
  # this is a place holder if java needed flags for javac they would go here.
  IF(NOT CMAKE_Java_CREATE_STATIC_LIBRARY)
+   IF(WIN32)
+     SET(class_files_mask "*.class")
+   ELSE(WIN32)
+     SET(class_files_mask ".")
+   ENDIF(WIN32)
+ 
    SET(CMAKE_Java_CREATE_STATIC_LIBRARY
!       "<CMAKE_Java_ARCHIVE> -cf <TARGET> -C <OBJECT_DIR> ${class_files_mask}")
!     # "${class_files_mask}" should really be "<OBJECTS>" but compling a *.java
!     # file can create more than one *.class file...
  ENDIF(NOT CMAKE_Java_CREATE_STATIC_LIBRARY)
  
***************
*** 24,28 ****
  IF(NOT CMAKE_Java_COMPILE_OBJECT)
    SET(CMAKE_Java_COMPILE_OBJECT
!     "<CMAKE_Java_COMPILER>   <FLAGS> <SOURCE> -d <OBJECT_DIR>")
  ENDIF(NOT CMAKE_Java_COMPILE_OBJECT)
  
--- 30,34 ----
  IF(NOT CMAKE_Java_COMPILE_OBJECT)
    SET(CMAKE_Java_COMPILE_OBJECT
!     "<CMAKE_Java_COMPILER> <FLAGS> <SOURCE> -d <OBJECT_DIR>")
  ENDIF(NOT CMAKE_Java_COMPILE_OBJECT)