[Cmake-commits] [cmake-commits] hoffman committed CMakeLists.txt 1.144.2.45 1.144.2.46 ChangeLog.manual 1.1.10.42 1.1.10.43 bootstrap 1.113 1.113.2.1

[cmake-commits at cmake.org]

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

Modified Files:
      Tag: CMake-2-6
	CMakeLists.txt ChangeLog.manual bootstrap 
Log Message:
ENH: merge in changes for 2.6.3 RC 1


Index: bootstrap
===================================================================
RCS file: /cvsroot/CMake/CMake/bootstrap,v
retrieving revision 1.113
retrieving revision 1.113.2.1
diff -C 2 -d -r1.113 -r1.113.2.1
*** bootstrap	7 Mar 2008 21:26:29 -0000	1.113
--- bootstrap	24 Oct 2008 15:18:44 -0000	1.113.2.1
***************
*** 74,77 ****
--- 74,84 ----
  fi
  
+ # Determine whether this is Haiku 
+ if echo "${cmake_system}" | grep Haiku >/dev/null 2>&1; then
+   cmake_system_haiku=true
+ else
+   cmake_system_haiku=false
+ fi
+ 
  # Choose the generator to use for bootstrapping.
  if ${cmake_system_mingw}; then
***************
*** 604,607 ****
--- 611,619 ----
  fi
  
+ # Add Haiku toolkits...
+ if ${cmake_system_haiku}; then
+   cmake_ld_flags="${LDFLAGS} -lroot -lbe"
+ fi
+ 
  # Test C compiler
  cmake_c_compiler=

Index: CMakeLists.txt
===================================================================
RCS file: /cvsroot/CMake/CMake/CMakeLists.txt,v
retrieving revision 1.144.2.45
retrieving revision 1.144.2.46
diff -C 2 -d -r1.144.2.45 -r1.144.2.46
*** CMakeLists.txt	24 Sep 2008 17:52:10 -0000	1.144.2.45
--- CMakeLists.txt	24 Oct 2008 15:18:44 -0000	1.144.2.46
***************
*** 354,359 ****
  SET(CMake_VERSION_MAJOR 2)
  SET(CMake_VERSION_MINOR 6)
! SET(CMake_VERSION_PATCH 2)
! #SET(CMake_VERSION_RC 6)
  # CVS versions are odd, if this is an odd minor version
  # then set the CMake_VERSION_DATE variable
--- 354,359 ----
  SET(CMake_VERSION_MAJOR 2)
  SET(CMake_VERSION_MINOR 6)
! SET(CMake_VERSION_PATCH 3)
! SET(CMake_VERSION_RC 1)
  # 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.42
retrieving revision 1.1.10.43
diff -C 2 -d -r1.1.10.42 -r1.1.10.43
*** ChangeLog.manual	23 Sep 2008 15:32:52 -0000	1.1.10.42
--- ChangeLog.manual	24 Oct 2008 15:18:44 -0000	1.1.10.43
***************
*** 1,2 ****
--- 1,36 ----
+ Changes in CMake 2.6.3 RC 1
+ - Better reporting when nmake compiler environment is not correct
+ - Fix bug #5936 set locale when running cvs and svn
+ - Teach find_library to find OpenBSD-style libs (issue #3470).
+ - Fix lib/ to lib/64/ search path conversion
+ - Fix CPack DESTDIR issue
+ - Support longer command lines with windows nmake and make
+ - Fix bug with color check for dependency scanning
+ - Use new link info during dependency scanning
+ - Fix find_* search order with path suffixes
+ - Fix install with multiple configurations and makefiles.
+ - Improve find_package interface for recursive find modules.
+ - Fix build issues with older visual studio versions
+ - Fix Xcode release builds 
+ - Put custom target sources in Xcode projects
+ - Fix return value from cmake -E time commands
+ - Fix documentation for cmake --debug-trycompile
+ - Add Haiku support
+ - Fix bug, allow enable_language to be called for C after CXX
+ - Add FindCoin3D.cmake
+ - Fix bug in FindGLUT.cmake
+ - Better find of perl in FindPerlLibs.cmake
+ - FindQt4 Fix #7784, Fix #7433
+ - FindQt4 refind qt when qmake changes
+ - Fix to find wxWidgets_LIB_DIR for windows platform more generally.
+ - Find ttkstup in FindTclStub.cmake
+ - Skip a command if its arguments fail to parse
+ - Fix convenience rule working directory
+ - Add support for source code control and visual stuido
+ - Add parenthetical expressions to if 
+ - Fix Rc command with -D options and nmake
+ - Fix NSIS detection on windows 2000
+ - Display an error message in ccmake when there are errors
+ 
  Changes in CMake 2.6.2 RC 6
  - Fix bug#7669 cpack did not work when sym-linked after install