[Cmake-commits] [cmake-commits] hoffman committed CMakeLists.txt 1.144.2.33 1.144.2.34 ChangeLog.manual 1.1.10.32 1.1.10.33

[cmake-commits at cmake.org]

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

Modified Files:
      Tag: CMake-2-6
	CMakeLists.txt ChangeLog.manual 
Log Message:
ENH: merge in from main tree and fix bug for flex and yacc stuff in SecondLife


Index: CMakeLists.txt
===================================================================
RCS file: /cvsroot/CMake/CMake/CMakeLists.txt,v
retrieving revision 1.144.2.33
retrieving revision 1.144.2.34
diff -C 2 -d -r1.144.2.33 -r1.144.2.34
*** CMakeLists.txt	22 Jul 2008 18:04:23 -0000	1.144.2.33
--- CMakeLists.txt	26 Jul 2008 03:23:54 -0000	1.144.2.34
***************
*** 355,359 ****
  SET(CMake_VERSION_MINOR 6)
  SET(CMake_VERSION_PATCH 1)
! SET(CMake_VERSION_RC 12)
  # CVS versions are odd, if this is an odd minor version
  # then set the CMake_VERSION_DATE variable
--- 355,359 ----
  SET(CMake_VERSION_MINOR 6)
  SET(CMake_VERSION_PATCH 1)
! SET(CMake_VERSION_RC 13)
  # CVS versions are odd, if this is an odd minor version
  # then set the CMake_VERSION_DATE variable

Index: ChangeLog.manual
===================================================================
RCS file: /cvsroot/CMake/CMake/Attic/ChangeLog.manual,v
retrieving revision 1.1.10.32
retrieving revision 1.1.10.33
diff -C 2 -d -r1.1.10.32 -r1.1.10.33
*** ChangeLog.manual	22 Jul 2008 18:04:23 -0000	1.1.10.32
--- ChangeLog.manual	26 Jul 2008 03:23:54 -0000	1.1.10.33
***************
*** 1,3 ****
--- 1,6 ----
  Changes in CMake 2.6.1 RC 12
+ - More find locations for FindJNI.
+ - Fix bug with source files ending in .l and .l.cpp, causing cmake
+   to think they were the same file in some cases.
  - Fix issue with .lib being seen as .obj with VS due to a full path
    to a library given without the file extension.  This only worked