Brad King
05e3abafa5
Merge branch 'upstream-KWSys' into update-kwsys
...
# By KWSys Upstream
* upstream-KWSys:
KWSys 2020-08-05 (185dd56e)
2020-08-05 16:29:07 -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
ef4d992b54
Merge branch 'upstream-KWSys' into update-kwsys
...
# By KWSys Upstream
* upstream-KWSys:
KWSys 2020-05-18 (146f6b36)
2020-05-18 08:51:33 -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
8191d39119
Merge branch 'upstream-KWSys' into update-kwsys
...
# By KWSys Upstream
* upstream-KWSys:
KWSys 2020-04-21 (44086372)
2020-04-21 07:15:22 -04:00
Brad King
b6ce851bef
Merge branch 'upstream-KWSys' into update-kwsys
...
# By KWSys Upstream
* upstream-KWSys:
KWSys 2020-04-17 (54845345)
2020-04-17 07:05:19 -04:00
Brad King
87a06afce3
Merge branch 'upstream-KWSys' into update-kwsys
...
# By KWSys Upstream
* upstream-KWSys:
KWSys 2020-04-15 (5ada375f)
2020-04-15 06:41:18 -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
5abe64246d
Merge branch 'upstream-KWSys' into update-kwsys
...
# By KWSys Upstream
* upstream-KWSys:
KWSys 2020-04-09 (e798e567)
2020-04-09 07:34:08 -04:00
Brad King
ff2e597ba2
Merge branch 'upstream-KWSys' into update-kwsys
...
# By KWSys Upstream
* upstream-KWSys:
KWSys 2020-04-07 (caff9c3b)
2020-04-07 10:31:10 -04:00
Brad King
dd8365b3f1
Merge branch 'upstream-KWSys' into update-kwsys
...
# By KWSys Upstream
* upstream-KWSys:
KWSys 2020-04-06 (af1f389c)
2020-04-06 09:24:42 -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
5f8d1668a2
Merge branch 'upstream-KWSys' into update-kwsys
...
# By KWSys Upstream
* upstream-KWSys:
KWSys 2020-03-25 (4380f1ae)
2020-03-25 07:47:51 -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
0b9f1cc96b
Merge branch 'upstream-KWSys' into win-no-error-popup
...
* upstream-KWSys:
KWSys 2019-11-15 (329d8c7c)
2019-11-15 09:21:08 -05:00
Brad King
dc01c73f2d
Merge branch 'upstream-KWSys' into update-kwsys
...
# By KWSys Upstream
* upstream-KWSys:
KWSys 2019-11-13 (e67ed8ef)
2019-11-13 09:48:23 -05:00
Brad King
5ddcaae77c
Merge branch 'upstream-KWSys' into update-kwsys
...
# By KWSys Upstream
* upstream-KWSys:
KWSys 2019-10-30 (43131a7c)
2019-10-30 09:17:30 -04: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
aff019f7a4
Merge branch 'upstream-KWSys' into update-kwsys
...
* upstream-KWSys:
KWSys 2019-07-25 (a24a6acb)
2019-07-25 07:54:34 -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
3a7f493b7b
Merge branch 'upstream-KWSys' into update-kwsys
...
* upstream-KWSys:
KWSys 2019-05-30 (f892bacf)
2019-05-30 09:31:35 -04:00
Brad King
23b3ca5e1f
Merge branch 'upstream-KWSys' into update-kwsys
...
* upstream-KWSys:
KWSys 2019-05-15 (dea11658)
2019-05-15 09:10:03 -04:00
Brad King
fb15c27562
Merge branch 'upstream-KWSys' into update-kwsys
...
* upstream-KWSys:
KWSys 2019-04-17 (c42b92f0)
2019-04-17 09:50:14 -04:00
Brad King
24da7da686
Merge branch 'upstream-KWSys' into update-kwsys
...
* upstream-KWSys:
KWSys 2019-03-28 (e92bdbe8)
2019-03-28 11:06:43 -04:00
Brad King
d79fa9dd55
Merge branch 'upstream-KWSys' into update-kwsys
...
* upstream-KWSys:
KWSys 2019-03-21 (fd41ac36)
2019-03-21 12:38:42 -04:00
Brad King
f6eebee194
Merge branch 'upstream-KWSys' into update-kwsys
...
* upstream-KWSys:
KWSys 2019-02-25 (833b2470)
2019-02-25 09:04:03 -05:00
Brad King
f510aafbfc
Merge branch 'upstream-KWSys' into update-kwsys
...
* upstream-KWSys:
KWSys 2019-02-14 (e270ce9f)
2019-02-14 10:55:44 -05:00
Brad King
ded4bc136e
Merge branch 'upstream-KWSys' into update-kwsys
...
* upstream-KWSys:
KWSys 2019-02-12 (44676809)
2019-02-12 08:35:12 -05:00
Brad King
9ddbf4c6e6
Merge branch 'upstream-KWSys' into update-kwsys
...
* upstream-KWSys:
KWSys 2019-02-05 (65802a20)
2019-02-05 07:20:34 -05:00
Brad King
e3b26f0004
Merge branch 'upstream-KWSys' into update-kwsys
...
* upstream-KWSys:
KWSys 2019-01-30 (ce89cada)
2019-01-30 10:36:24 -05: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
405d9cb4b5
Merge branch 'upstream-KWSys' into update-kwsys
...
* upstream-KWSys:
KWSys 2019-01-22 (4fecfe6f)
2019-01-22 11:29:56 -05:00
Brad King
0d88739736
Merge branch 'upstream-KWSys' into update-kwsys
...
* upstream-KWSys:
KWSys 2019-01-14 (1541d849)
2019-01-14 07:38:40 -05:00
Brad King
b29d96701b
Merge branch 'upstream-KWSys' into update-kwsys
...
* upstream-KWSys:
KWSys 2018-12-12 (abb8c680)
2018-12-12 08:14:53 -05:00
Brad King
014a098479
Merge branch 'upstream-KWSys' into update-kwsys
...
* upstream-KWSys:
KWSys 2018-11-28 (5ea12a52)
2018-11-28 08:56:00 -05:00
Brad King
533de8873a
Merge branch 'upstream-KWSys' into update-kwsys
...
* upstream-KWSys:
KWSys 2018-10-25 (9e27254b)
2018-10-25 07:53:11 -04:00
Brad King
a833c24ceb
Merge branch 'upstream-KWSys' into update-kwsys
...
* upstream-KWSys:
KWSys 2018-10-19 (c2f29d2e)
2018-10-19 10:03:25 -04:00
Brad King
0da3340b9c
Merge branch 'upstream-KWSys' into update-kwsys
...
* upstream-KWSys:
KWSys 2018-10-03 (9d6873b1)
2018-10-03 07:36:04 -04:00
Brad King
49e7a82c90
Merge branch 'upstream-KWSys' into update-kwsys
...
* upstream-KWSys:
KWSys 2018-09-14 (1809bedd)
2018-09-14 13:25:53 -04:00
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