mirror/CMake
1
0
Fork 0
mirror of https://github.com/Kitware/CMake.git synced 2026-01-04 04:40:56 -06:00
Code Issues Packages Projects Releases Wiki Activity
62,280 Commits 2 Branches 385 Tags
1e085cbff7059cd38ebea0bca8cb414fd30c2d06
Commit Graph

72 Commits

Author SHA1 Message Date
Brad King
dae189fb09 Merge branch 'upstream-KWSys' into update-kwsys 
# By KWSys Upstream
* upstream-KWSys:
  KWSys 2023-01-19 (be3c441e)
 2023-01-19 09:17:35 -05:00
Brad King
1e242a95d0 Merge branch 'upstream-KWSys' into update-kwsys 
# By KWSys Upstream
* upstream-KWSys:
  KWSys 2022-01-31 (9fd1660a)
 2022-01-31 15:27:01 -05:00
Brad King
e83bb75160 Merge branch 'upstream-KWSys' into update-kwsys 
# By KWSys Upstream
* upstream-KWSys:
  KWSys 2022-01-29 (389a74dc)
 2022-01-29 07:06:10 -05:00
Brad King
f52dac56a0 Merge branch 'upstream-KWSys' into update-kwsys 
# By KWSys Upstream
* upstream-KWSys:
  KWSys 2022-01-11 (15b0b0c4)
 2022-01-11 10:57:44 -05:00
Brad King
8d14ca3142 Merge branch 'upstream-KWSys' into update-kwsys 
# By KWSys Upstream
* upstream-KWSys:
  KWSys 2021-10-08 (b8c734ba)
 2021-10-12 11:38:24 -04:00
Brad King
8e16c9ed1c Merge branch 'upstream-KWSys' into update-kwsys 
# By KWSys Upstream
* upstream-KWSys:
  KWSys 2021-09-03 (0da908d4)
 2021-09-03 10:05:47 -04:00
Brad King
1b6fbdf1d7 Merge branch 'upstream-KWSys' into update-kwsys 
# By KWSys Upstream
* upstream-KWSys:
  KWSys 2021-06-02 (ad35b3ba)
 2021-06-02 07:46:47 -04:00
Brad King
ba87a84339 Merge branch 'upstream-KWSys' into update-kwsys 
# By KWSys Upstream
* upstream-KWSys:
  KWSys 2021-05-07 (979d7db0)
 2021-05-07 09:26:05 -04:00
Brad King
b5cb26e287 Merge branch 'upstream-KWSys' into update-kwsys 
# By KWSys Upstream
* upstream-KWSys:
  KWSys 2021-04-19 (d6139c66)
 2021-04-19 09:46:56 -04:00
Brad King
ead4adad75 Merge branch 'upstream-KWSys' into update-kwsys 
# By KWSys Upstream
* upstream-KWSys:
  KWSys 2020-07-24 (c3054d90)
 2020-07-24 07:05:24 -04:00
Brad King
9c161cc2d0 Merge branch 'upstream-KWSys' into update-kwsys 
# By KWSys Upstream
* upstream-KWSys:
  KWSys 2020-05-27 (a3263389)
 2020-05-27 08:33:39 -04:00
Brad King
833ae0a63b Merge branch 'upstream-KWSys' into update-kwsys 
# By KWSys Upstream
* upstream-KWSys:
  KWSys 2020-05-13 (d4da6980)
 2020-05-13 07:08:22 -04:00
Brad King
0b495b6ca9 Merge branch 'upstream-KWSys' into update-kwsys 
# By KWSys Upstream
* upstream-KWSys:
  KWSys 2020-04-10 (b62956f5)
 2020-04-10 07:56:14 -04:00
Brad King
afe8a5eb3f Merge branch 'upstream-KWSys' into update-kwsys 
# By KWSys Upstream
* upstream-KWSys:
  KWSys 2020-04-01 (25694819)
 2020-04-01 10:15:00 -04:00
Brad King
9e6b07f5ff Merge branch 'upstream-KWSys' into update-kwsys 
# By KWSys Upstream
* upstream-KWSys:
  KWSys 2020-03-04 (6af2e592)
 2020-03-04 08:00:24 -05:00
Brad King
71764b88d6 Merge branch 'upstream-KWSys' into update-kwsys 
# By KWSys Upstream
* upstream-KWSys:
  KWSys 2020-02-25 (b14ce28a)
 2020-02-25 09:41:26 -05:00
Brad King
fc6eced05e Merge branch 'upstream-KWSys' into update-kwsys 
# By KWSys Upstream
* upstream-KWSys:
  KWSys 2020-02-17 (3e117fe1)
 2020-02-17 11:59:07 -05:00
Brad King
56879273dc Merge branch 'upstream-KWSys' into update-kwsys 
# By KWSys Upstream
* upstream-KWSys:
  KWSys 2019-09-18 (c6bc38c1)
 2019-09-18 09:26:40 -04:00
Brad King
6a9de634b2 Merge branch 'upstream-KWSys' into update-kwsys 
# By KWSys Upstream
* upstream-KWSys:
  KWSys 2019-08-29 (08f14d96)
 2019-08-29 13:07:11 -04:00
Brad King
d46bac5d38 Makefile: Fix regression in dependencies on relative includes 
Since commit a13a5c948e (Replace use of CollapseCombinedPath with
CollapseFullPath, 2019-03-19, v3.15.0-rc1~361^2~1), one code path now
calls `CollapseFullPath` with a base path that may be relative.
Backport KWSys commit c6f8e24a3 (SystemTools: Fix CollapseFullPath with
relative base path, 2019-07-24) to handle such base paths.

This case occurs when a build tree is placed in a directory inside a
source tree such that CMake is willing to generate a relative path from
the build tree to the source tree.  Add a test covering this case.

Fixes: #19507
 2019-07-24 11:37:31 -04:00
Brad King
d67ce0a61e Merge branch 'upstream-KWSys' into update-kwsys 
* upstream-KWSys:
  KWSys 2019-01-24 (b9dd1636)
 2019-01-24 09:52:25 -05: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
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
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
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
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
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
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
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
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
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
95a97a40e4 Merge branch 'upstream-KWSys' into update-kwsys 
* upstream-KWSys:
  KWSys 2016-11-09 (18c65411)
 2016-11-09 09:23:18 -05:00
Brad King
04d94fbe92 Merge branch 'upstream-KWSys' into update-kwsys 
* upstream-KWSys:
  KWSys 2016-09-14 (c4049689)

Issue: #16295
 2016-09-14 09:49:37 -04:00
Brad King
8abca14034 Merge branch 'upstream-KWSys' into update-kwsys 
* upstream-KWSys:
  KWSys 2016-08-03 (6d23dd7e)
 2016-08-04 10:11:07 -04:00
Brad King
788bb14664 Merge branch 'upstream-KWSys' into update-kwsys 
* upstream-KWSys:
  KWSys 2016-07-18 (19732229)
 2016-07-19 08:27:19 -04:00
Brad King
306e2016bb Merge branch 'upstream-kwsys' into update-kwsys 2015-12-04 09:59:04 -05:00
Brad King
def90d5fa5 Merge branch 'upstream-kwsys' into update-kwsys 2015-09-29 10:10:03 -04:00
Brad King
c5cc3441b3 Merge branch 'upstream-kwsys' into update-kwsys 2015-09-02 10:23:17 -04:00
Brad King
49d293a795 Merge branch 'upstream-kwsys' into update-kwsys 2015-08-31 09:55:01 -04:00
Brad King
3da431379b Merge branch 'upstream-kwsys' into update-kwsys 2015-08-03 13:17:54 -04:00
Brad King
bf365792a1 Merge branch 'upstream-kwsys' into update-kwsys 2015-05-28 08:21:55 -04:00
Brad King
5868b4e2fb Merge branch 'upstream-kwsys' into update-kwsys 2014-10-31 13:11:58 -04:00
Brad King
daab3b3bdf Merge branch 'upstream-kwsys' into update-kwsys 2014-09-09 08:46:41 -04:00
Brad King
51c82c3a66 Merge branch 'upstream-kwsys' into update-kwsys 2014-08-11 09:30:22 -04:00
Brad King
60c783676c Merge branch 'upstream-kwsys' into update-kwsys 2014-08-04 10:16:34 -04:00