mirror/CMake
1
0
Fork 0
mirror of https://github.com/Kitware/CMake.git synced 2026-04-20 21:28:23 -05:00
Code Issues Packages Projects Releases Wiki Activity
40,387 Commits 2 Branches 399 Tags
c549deed7fc6dec2c3f5f3ab5f9ded1acb916239
Commit Graph

2778 Commits

Author SHA1 Message Date
Brad King ba872ea9c3 Merge branch 'upstream-KWSys' into update-kwsys 
* upstream-KWSys:
  KWSys 2018-08-07 (9044518f)
 2018-08-07 07:16:09 -04:00
Brad King c5a1491e90 Merge branch 'upstream-KWSys' into update-kwsys 
* upstream-KWSys:
  KWSys 2018-07-12 (86ce4f37)
 2018-07-12 08:47:15 -04:00
Brad King 7c32432a80 Merge branch 'upstream-KWSys' into update-kwsys 
* upstream-KWSys:
  KWSys 2018-07-10 (51982681)
 2018-07-10 08:46:37 -04:00
Brad King f2d97c1cdf Merge branch 'upstream-KWSys' into update-kwsys 
* upstream-KWSys:
  KWSys 2018-06-22 (49068d94)
 2018-06-22 11:31:36 -04:00
Brad King 4eae1c0816 Merge branch 'upstream-KWSys' into update-kwsys 
* upstream-KWSys:
  KWSys 2018-06-14 (2b0ca1d8)
 2018-06-14 11:26:37 -04:00
Brad King 81870f1159 Merge branch 'upstream-KWSys' into update-kwsys 
* upstream-KWSys:
  KWSys 2018-06-01 (8ef62b28)
 2018-06-01 12:54:13 -04:00
Brad King b730097788 Merge branch 'upstream-KWSys' into update-kwsys 
* upstream-KWSys:
  KWSys 2018-05-18 (5357cfc4)
 2018-05-18 09:52:13 -04:00
Brad King 24367563d7 Merge branch 'upstream-KWSys' into update-kwsys 
* upstream-KWSys:
  KWSys 2018-05-15 (5f757898)

Fixes: #16001
 2018-05-16 09:54:08 -04:00
Brad King 05d67d2545 Merge branch 'upstream-KWSys' into update-kwsys 
* upstream-KWSys:
  KWSys 2018-05-11 (46da6b14)
 2018-05-11 11:34:27 -04:00
Brad King 5ebbf2807b Merge branch 'upstream-KWSys' into update-kwsys 
* upstream-KWSys:
  KWSys 2018-04-12 (9da3e5bc)
 2018-04-12 13:05:38 -04:00
Brad King 4c90e94368 Merge branch 'upstream-KWSys' into update-kwsys 
* upstream-KWSys:
  KWSys 2018-03-29 (488f2031)
 2018-03-29 11:41:57 -04:00
Brad King 2c5b4359f8 Merge branch 'upstream-KWSys' into update-kwsys 
* upstream-KWSys:
  KWSys 2018-03-07 (2ad561e7)
 2018-03-07 06:48:34 -05:00
Brad King be46f9fb6e Merge branch 'upstream-KWSys' into update-kwsys 
* upstream-KWSys:
  KWSys 2018-02-01 (04fcc449)
 2018-02-01 08:15:44 -05:00
Brad King f8e8946815 Merge branch 'upstream-KWSys' into update-kwsys 
* upstream-KWSys:
  KWSys 2018-01-23 (0579db1c)
 2018-01-24 14:11:07 -05:00
Brad King 4966c8d8da Merge branch 'upstream-KWSys' into update-kwsys 
* upstream-KWSys:
  KWSys 2017-12-15 (8f755ee9)
 2017-12-15 10:48:13 -05:00
Brad King 834d187841 Merge branch 'upstream-KWSys' into update-kwsys 
* upstream-KWSys:
  KWSys 2017-12-12 (3ba214b7)
 2017-12-12 07:51:51 -05:00
Brad King 9dee52baca Merge branch 'upstream-KWSys' into update-kwsys 
* upstream-KWSys:
  KWSys 2017-12-08 (2d27b1d0)
 2017-12-08 10:08:39 -05:00
Brad King c50f08cdd8 Merge branch 'upstream-KWSys' into update-kwsys 
* upstream-KWSys:
  KWSys 2017-12-07 (4aee0036)
 2017-12-07 07:25:03 -05:00
Brad King 4a8bbc520a Merge branch 'upstream-KWSys' into update-kwsys 
* upstream-KWSys:
  KWSys 2017-12-05 (9376537e)
 2017-12-05 11:31:27 -05:00
Brad King be8ec41896 Merge branch 'upstream-KWSys' into update-kwsys 
* upstream-KWSys:
  KWSys 2017-12-01 (0f0023b1)
 2017-12-01 08:52:33 -05:00
Brad King d094b6796a Merge branch 'upstream-KWSys' into update-kwsys 
* upstream-KWSys:
  KWSys 2017-11-30 (fa1ab7b8)
 2017-11-30 08:52:45 -05:00
Brad King 8bef3e31bd Merge branch 'upstream-KWSys' into update-kwsys 
* upstream-KWSys:
  KWSys 2017-11-09 (40d7b1bb)
 2017-11-09 08:35:51 -05:00
Brad King 517cfe0b8c Merge branch 'upstream-KWSys' into update-kwsys 
* upstream-KWSys:
  KWSys 2017-11-07 (5249a82d)
 2017-11-07 08:16:14 -05:00
Brad King 3048777006 Merge branch 'upstream-KWSys' into update-kwsys 
* upstream-KWSys:
  KWSys 2017-11-02 (54f0901a)
 2017-11-02 09:48:53 -04:00
Brad King 7576e9f8a3 Merge branch 'upstream-KWSys' into update-kwsys 
* upstream-KWSys:
  KWSys 2017-11-01 (6ffca34c)
 2017-11-01 08:38:26 -04:00
Brad King df92617b73 Merge branch 'upstream-KWSys' into update-kwsys 
* upstream-KWSys:
  KWSys 2017-10-12 (ef0ad34d)
 2017-10-13 09:14:04 -04:00
Brad King f1a4ecdc0c Merge branch 'upstream-KWSys' into update-kwsys 
* upstream-KWSys:
  KWSys 2017-10-10 (239bc737)
 2017-10-10 08:43:41 -04:00
Brad King 90f1b9ad4e Merge branch 'upstream-KWSys' into update-kwsys 
* upstream-KWSys:
  KWSys 2017-09-30 (f108739d)
 2017-09-30 10:07:56 -04:00
Brad King ff0ddff785 Merge branch 'upstream-KWSys' into update-kwsys 
* upstream-KWSys:
  KWSys 2017-09-21 (ff912e4d)
 2017-09-21 07:17:36 -04:00
Brad King f02eced51d Merge branch 'upstream-KWSys' into update-kwsys 
* upstream-KWSys:
  KWSys 2017-09-14 (d85b17e7)
 2017-09-14 08:44:26 -04:00
Brad King cbf2017822 Merge branch 'upstream-KWSys' into update-kwsys 
* upstream-KWSys:
  KWSys 2017-09-01 (aee0cf59)
 2017-09-01 10:35:19 -04:00
Brad King 060cef0c44 Merge branch 'upstream-KWSys' into update-kwsys 
* upstream-KWSys:
  KWSys 2017-08-11 (e1006189)
 2017-08-11 10:13:23 -04:00
Brad King 3d1c3e0dcf Merge branch 'upstream-KWSys' into update-kwsys 
* upstream-KWSys:
  KWSys 2017-06-09 (a700e2ab)
 2017-06-09 11:03:34 -04:00
Brad King 594a9fcf6f Merge branch 'upstream-KWSys' into update-kwsys 
* upstream-KWSys:
  KWSys 2017-06-01 (8243fefa)
 2017-06-01 14:07:35 -04:00
Brad King 5e9bd8a2ea Merge branch 'upstream-KWSys' into update-kwsys 
* upstream-KWSys:
  KWSys 2017-05-31 (bd0bbad7)
 2017-05-31 09:11:14 -04:00
Brad King 867b17428a Merge branch 'upstream-KWSys' into update-kwsys 
* upstream-KWSys:
  KWSys 2017-05-25 (160bed45)
 2017-05-25 09:40:59 -04:00
Brad King 6f3341591d Merge branch 'upstream-KWSys' into update-kwsys 
* upstream-KWSys:
  KWSys 2017-05-23 (411e958f)
 2017-05-23 14:34:26 -04:00
Brad King 16ebd9f615 Merge branch 'upstream-KWSys' into update-kwsys 
* upstream-KWSys:
  KWSys 2017-05-16 (fe1f22ce)
 2017-05-16 11:39:01 -04:00
Brad King 750d58bf61 Merge branch 'upstream-KWSys' into update-kwsys 
* upstream-KWSys:
  KWSys 2017-05-01 (3ec3252c)
 2017-05-01 10:25:35 -04:00
Ben Boeckel d88a511da3 kwsys: match upstream changes 
This allows the import to merge cleanly.
 2017-04-20 15:35:39 -04:00
Ben Boeckel e832c32ca8 kwsys: remove extra attribute 
This is set in `Source/.gitattributes` already and does not need to be
set inside of the import.
 2017-04-20 12:53:33 -04:00
Brad King 697a5d64d8 Merge branch 'upstream-KWSys' into update-kwsys 
* upstream-KWSys:
  KWSys 2017-04-19 (9f6ffaff)
 2017-04-19 08:02:06 -04:00
Brad King ada8e0cac4 Merge branch 'upstream-KWSys' into update-kwsys 
* upstream-KWSys:
  KWSys 2017-04-12 (23a4c211)
 2017-04-12 09:10:22 -04:00
Brad King cdd2875ad2 Merge branch 'upstream-KWSys' into update-kwsys 
* upstream-KWSys:
  KWSys 2017-03-28 (34999b6a)
 2017-03-28 10:18:10 -04:00
Brad King ea2a91a432 Merge branch 'upstream-KWSys' into update-kwsys 
* upstream-KWSys:
  KWSys 2017-03-24 (7e9f7b7b)

Resolve conflicts in `.gitattributes` by integrating changes from both
sides.  Keep the `our-c-style` attribute that KWSys uses, but drop their
definition of it in favor of ours (Git only allows custom attributes in
the top level anyway).  Then add our own attribute line to unset the
`format.clang-format` attribute for KWSys sources since we do not want
to format third-party code ourselves.
 2017-03-24 15:17:25 -04:00
Brad King 83be64d99c Merge branch 'upstream-KWSys' into update-kwsys 
* upstream-KWSys:
  KWSys 2017-03-07 (5da8cfe0)
 2017-03-10 16:24:53 -05:00
Brad King ff843dbd54 Merge branch 'upstream-KWSys' into update-kwsys 
* upstream-KWSys:
  KWSys 2017-02-14 (5c6f7836)
 2017-02-14 09:22:07 -05:00
Brad King c2645e1979 Merge branch 'upstream-KWSys' into update-kwsys 
* upstream-KWSys:
  KWSys 2017-02-06 (ef673998)
 2017-02-06 13:01:40 -05:00
Brad King ee77941a1f Merge branch 'upstream-KWSys' into update-kwsys 
* upstream-KWSys:
  KWSys 2017-01-16 (a423d829)
 2017-01-16 14:06:29 -05:00
Brad King da03e2d6c6 Merge branch 'upstream-KWSys' into update-kwsys 
* upstream-KWSys:
  KWSys 2016-12-14 (95a7e234)
 2016-12-14 11:19:03 -05:00