Commit Graph

25 Commits

Author SHA1 Message Date
Brad King
f9116d0225 CMake 2.8.2 2010-06-28 10:23:40 -04:00
Brad King
e010d1f688 CMake 2.8.2-rc4 2010-06-24 10:48:52 -04:00
Brad King
7f662c5c62 CMake 2.8.2-rc3 2010-06-22 10:08:36 -04:00
Brad King
5b3987bc41 CMake 2.8.2-rc2 2010-06-15 14:47:52 -04:00
Brad King
23a8f31e3f Merge branch 'release' 2010-06-15 14:33:11 -04:00
Brad King
9949f9fbff ChangeLog: Mention "current" and "since" versions 2010-06-15 14:33:04 -04:00
Brad King
c3781efb28 ctest_update: Support Git upstream branch rewrites
Use 'git fetch' followed by 'git reset' to update the source tree.  This
is better than 'git pull' because it can handle a rewritten upstream
branch and does not leave local modifications.  After fetch, parse
FETCH_HEAD to find the merge head that 'git pull' would choose to track
the upstream branch.  Then reset to the selected head.

In the normal fast-forward case the behavior remains unchanged.
However, now local modifications and commits will be erased, and
upstream rewrites are handled smoothly.  This ensures that the upstream
branch is tested as expected.
2010-06-08 16:50:17 -04:00
Brad King
6f9bb934d4 Merge branch 'sunCC-5.11-rpath-link' 2010-06-08 09:23:11 -04:00
Brad King
25619a87fc ChangeLog: Mention new Sun compiler support 2010-06-08 09:22:43 -04:00
Brad King
755df4468a ChangeLog: Update for today's topic merges 2010-06-07 14:53:26 -04:00
Brad King
e6cd880381 ChangeLog: Changes since CMake 2.8.1 2010-05-17 13:39:16 -04:00
Bill Hoffman
8c89b5e2dc CMake 2.8.1 2010-03-16 13:49:53 -04:00
Bill Hoffman
1274ce5bf3 CMake 2.8.1-rc5
Fix Qt with OpenGL on the Mac.
Add .git .bzr and .hg to the list of default CPack ignore directories.
Bump RC number
Update ChangeLog.manual
2010-03-10 14:41:44 -05:00
Brad King
6dde154313 CMake 2.8.1-rc4
This commit cherry-picks and squashes the following commits:

  4685872 "FortranCInterface: Fix PathScale detection..." (2010-02-16)
  b39fe94 "Fix problem with ExternalProject test..." (2010-02-17)
  70290e1 "Add support for QtDeclartive module" (2010-02-17)
  282ba89 "Clarify CMAKE_MODULE_PATH documentation" (2010-02-18)
  4eba05d "Suppress GNU flag -fPIC on Windows" (2010-02-19)
  57efb4a "BUG: We shouldn't be setting the HideWindow..." (2010-02-19)
2010-03-05 08:19:39 -05:00
Brad King
f195a131cc CMake 2.8.1-rc3 2010-02-16 10:35:33 -05:00
Brad King
224dde9085 CMake 2.8.1-rc2 2010-02-11 10:50:43 -05:00
Brad King
dc1d2189ae CMake 2.8.1-rc1 2010-01-28 16:48:20 -05:00
Brad King
612409e5b0 CMake 2.8.0 2009-11-13 09:07:10 -05:00
Brad King
d2715cae49 CMake 2.8.0-rc7 2009-11-11 13:34:21 -05:00
Brad King
29ebc97c38 CMake 2.8.0-rc6 2009-11-10 09:03:39 -05:00
Brad King
86eac830b3 CMake 2.8.0-rc5 2009-11-03 17:25:20 -05:00
Bill Hoffman
b4ae8bad4b RC 4 merge 2009-10-28 12:17:18 -04:00
Bill Hoffman
ebd0c2d377 Merge in changes for RC 3 2009-10-09 16:11:47 -04:00
Bill Hoffman
f9687e328f Merge in changes to CMake-2-8 RC 2 2009-10-01 17:21:28 -04:00
Bill Hoffman
3c7354c1cd Add change log and fix UMR in ctest from head. 2009-09-25 12:25:23 -04:00