[Cmake-commits] [cmake-commits] hoffman committed CMakeJavaInformation.cmake 1.9 1.9.2.1 FindSubversion.cmake 1.2.2.1 1.2.2.2

[cmake-commits at cmake.org]

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

Modified Files:
      Tag: CMake-2-6
	CMakeJavaInformation.cmake FindSubversion.cmake 
Log Message:
ENH: merge in from main tree


Index: CMakeJavaInformation.cmake
===================================================================
RCS file: /cvsroot/CMake/CMake/Modules/CMakeJavaInformation.cmake,v
retrieving revision 1.9
retrieving revision 1.9.2.1
diff -C 2 -d -r1.9 -r1.9.2.1
*** CMakeJavaInformation.cmake	13 Mar 2008 19:03:20 -0000	1.9
--- CMakeJavaInformation.cmake	26 Mar 2008 18:08:22 -0000	1.9.2.1
***************
*** 15,23 ****
  # 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
--- 15,23 ----
  # 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