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

[cmake-commits at cmake.org]

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

Modified Files:
	CMakeJavaInformation.cmake 
Log Message:
BUG: Go back to using "." so the Java test passes on the nightly nmake dashboards again. Still need a solution that works with both nmake and Visual Studio builds.


Index: CMakeJavaInformation.cmake
===================================================================
RCS file: /cvsroot/CMake/CMake/Modules/CMakeJavaInformation.cmake,v
retrieving revision 1.9
retrieving revision 1.10
diff -C 2 -d -r1.9 -r1.10
*** CMakeJavaInformation.cmake	13 Mar 2008 19:03:20 -0000	1.9
--- CMakeJavaInformation.cmake	16 Mar 2008 00:10:02 -0000	1.10
***************
*** 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