Commit Graph

48092 Commits

Author SHA1 Message Date
Brad King eb2a554b12 Merge topic 'vs-pch-compile-opts'
6b2fb4ffd2 VS: Fix using PCH from source with COMPILE_OPTIONS

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !4734
2020-05-12 06:53:41 -04:00
Brad King b049f0af52 Merge branch 'release-3.17' 2020-05-12 06:52:41 -04:00
Brad King cd89ebdda2 Merge topic 'pch-msvc-pragma'
6c2514dabe MSVC: Use 'pragma system_header' in PCH only on cl 19.13 and above

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !4736
2020-05-12 06:52:40 -04:00
Brad King 91dd23d3d5 Merge topic 'pch-msvc-pragma' into release-3.17
6c2514dabe MSVC: Use 'pragma system_header' in PCH only on cl 19.13 and above

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !4736
2020-05-12 06:52:40 -04:00
Brad King 04a29efe99 Merge branch 'release-3.17' 2020-05-12 06:51:32 -04:00
Brad King b47b30365e Merge topic 'xl-cpp-install'
f7a94cf282 XL: Install our Fortran 'cpp' helper script with execute permission

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !4735
2020-05-12 06:51:32 -04:00
Brad King dc75a0728a Merge topic 'xl-cpp-install' into release-3.17
f7a94cf282 XL: Install our Fortran 'cpp' helper script with execute permission

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !4735
2020-05-12 06:51:31 -04:00
Brad King fddc0fd49c Merge topic 'system-zlib-qt-warnings'
029928b706 CTestCustom: Suppress warning about zlib symbol conflict with QtCore

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !4732
2020-05-12 06:50:03 -04:00
Kitware Robot 327e79c359 CMake Nightly Date Stamp 2020-05-12 00:01:17 -04:00
Brad King 6c2514dabe MSVC: Use 'pragma system_header' in PCH only on cl 19.13 and above
VS 2017 15.6 introduced support for this pragma.  Older MSVC versions
warn that it is unknown.

Fixes: #20692
2020-05-11 13:31:15 -04:00
Brad King f7a94cf282 XL: Install our Fortran 'cpp' helper script with execute permission
This script was added by commit 19f267c75e (XL: Add support for Ninja
and XL Fortran, 2019-11-21, v3.17.0-rc1~368^2) but does not have a `.sh`
extension so our existing install rules neglect to give it execute
permission.  Our test suite works on XL Fortran in the build tree but
the script is broken without execute permission on installation.

Fixes: #20695
2020-05-11 12:13:25 -04:00
Brad King 6b2fb4ffd2 VS: Fix using PCH from source with COMPILE_OPTIONS
If a source file gets per-source flags from both PCH and custom
`COMPILE_OPTIONS`, combine them correctly.

Fixes: #20694, #20456
2020-05-11 11:58:41 -04:00
Brad King 50f6207c52 Merge topic 'doxygen-generated-sources'
5ec9690802 FindDoxygen: Allow generated files with USE_STAMP_FILE
683abe4366 FindDoxygen: Formatting-only indentation cleanup for test case

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !4726
2020-05-11 10:16:37 -04:00
Brad King d4b1d3d4f0 Merge topic 'source_group_forward_slashes'
faf44a8cdb source_group: Support forward slashes in group hierarchy

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !4727
2020-05-11 10:14:24 -04:00
Brad King 03885463b4 Merge branch 'release-3.16' 2020-05-11 10:12:51 -04:00
Brad King b86b2ba59e Merge branch 'release-3.17' 2020-05-11 10:12:15 -04:00
Brad King 4de2cb4c41 Merge topic 'FindGTK2-harfbuzz-target' into release-3.17
5ab137b7e9 FindGTK2: Add harfbuzz target for dependency from pango

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !4725
2020-05-11 10:12:14 -04:00
Brad King 6fa5194dde Merge topic 'FindGTK2-harfbuzz-target'
5ab137b7e9 FindGTK2: Add harfbuzz target for dependency from pango

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !4725
2020-05-11 10:12:14 -04:00
Brad King cee7eb8b3a Merge topic 'unity_explicit_groups'
9f4eb352fe Unity Builds: Support explicit specification of sources to groups
b00585adcc Unity: Refactor implementation to make it easier to extend

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !4716
2020-05-11 10:08:12 -04:00
Brad King 029928b706 CTestCustom: Suppress warning about zlib symbol conflict with QtCore
When building `cmake-gui` with system-installed `zlib` and `QtCore`,
the latter has a different copy of zlib that conflicts and produces
warnings on Solaris.  Suppress them from report to CDash to clean
up nightly builds.
2020-05-11 09:51:13 -04:00
Kitware Robot c2460c0e63 CMake Nightly Date Stamp 2020-05-11 00:01:15 -04:00
Craig Scott faf44a8cdb source_group: Support forward slashes in group hierarchy
Fixes: #18076
2020-05-11 08:15:25 +10:00
Craig Scott 8afac758e6 Merge topic 'doc-option-existing-var'
36a6d91011 Help: If a cache variable exists, option() also does nothing

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !4721
2020-05-10 02:34:25 -04:00
Kitware Robot edbbd67461 CMake Nightly Date Stamp 2020-05-10 00:01:10 -04:00
Brad King 68f60c073f Merge branch 'FindGTK2-harfbuzz-target' into release-3.16
Merge-request: !4725
2020-05-09 06:40:26 -04:00
Brad King 5ab137b7e9 FindGTK2: Add harfbuzz target for dependency from pango
Since commit effafca77e (FindGTK2: Add harfbuzz to GTK2_INCLUDE_DIRS,
2019-10-01, v3.16.0-rc1~22^2), pango's dependency on harfbuzz has been
captured, but only for the `GTK2_INCLUDE_DIRS` and `GTK2_LIBRARIES`
variables.  Add the `GTK2::harfbuzz` imported target and update the
`GTK2::pango` target to depend on it.

Issue: #19531
2020-05-09 06:38:18 -04:00
Kitware Robot d59e65ecc0 CMake Nightly Date Stamp 2020-05-09 00:01:18 -04:00
Craig Scott 5ec9690802 FindDoxygen: Allow generated files with USE_STAMP_FILE
Fixes: #20597
2020-05-09 13:35:51 +10:00
Craig Scott 683abe4366 FindDoxygen: Formatting-only indentation cleanup for test case 2020-05-09 13:35:41 +10:00
Brad King a1f147b0b3 Merge topic 'sphinx-builder-linux-3.17'
20fbf69f67 gitlab-ci: add linux-3.17 tag to the sphinx build

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !4722
2020-05-08 09:03:31 -04:00
Ben Boeckel 20fbf69f67 gitlab-ci: add linux-3.17 tag to the sphinx build
This build uses Qt libraries in a Fedora container. This library is
tagged with a note which says it requires Linux 3.17. Some of or CI
runners do not have this kernel on the host which causes glibc to refuse
to load it. Add a tag to indicate that we need a newer kernel on the
runner.
2020-05-08 08:52:00 -04:00
Brad King fe82e1b45f Merge topic 'install-rpath-escape-doc'
495951ea68 Help: Mention CMP0095 in INSTALL_RPATH documentation

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !4720
2020-05-08 08:19:10 -04:00
Brad King 171bf5fa92 Merge topic 'third-parties-layout'
2faa3f6c55 Refactoring: Third-parties public headers are under cm3p prefix
75e87e3db4 bootstrap: update list of problematic files

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !4705
2020-05-08 08:18:17 -04:00
Brad King 3a0ea8f93a Merge branch 'release-3.17' 2020-05-08 08:13:40 -04:00
Brad King ccd604da2e Merge branch 'backport-3.17-FindPython-check-specified-version' into release-3.17
Merge-request: !4718
2020-05-08 08:08:22 -04:00
Brad King 8887414432 Merge topic 'gitlab-ci-sphinx'
50cbc9b77a gitlab-ci: add a sphinx builder
d78bf2f229 ci: install sphinx into the CI image
671ff5f1ac ci: skip weak dependencies in the CI image
bdce0fc317 CTestCustom: fix indentation
e4f398e0af Help: add alt text to embedded images
758ab4dbd3 Utilities/Sphinx: allow CDash submission for the standalone build
16de8e3544 Utilities/Sphinx: support finding Qt5's qcollectiongenerator too

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !4713
2020-05-08 08:06:03 -04:00
Brad King 5c9d0905e7 Merge topic 'docker-rel-win'
7670ba8b0a Utilities/Release: Drop win{32,64} scripts in favor of docker build
ff929badb3 Utilities/Release: Add docker specs to build and test Windows binaries
5f4f7e637a Utilities/Release: Generalize OS in README docker instructions
13467f1dbd Utilities/Release: Make README docker examples more readable
593c3fa1d4 Utilities/Release: Remove unused linux/x86_64/test/cache-ninja.txt

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !4719
2020-05-08 08:04:51 -04:00
Brad King 3fa0381e9e Merge topic 'pch-reuse-multi' into release-3.17
7a1c7736cb PCH: Fix REUSE_FROM in multi-config generators

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !4717
2020-05-08 08:03:44 -04:00
Brad King 7d6690d0fa Merge branch 'release-3.17' 2020-05-08 08:03:44 -04:00
Brad King 195090f9f0 Merge topic 'pch-reuse-multi'
a2ee941aba Merge branch 'backport-pch-reuse-multi' into pch-reuse-multi
605d6c65c9 PCH: Fix REUSE_FROM in multi-config generators
7a1c7736cb PCH: Fix REUSE_FROM in multi-config generators

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !4717
2020-05-08 08:03:44 -04:00
Brad King fb4959eadc Merge topic 'FindPython-check-specified-version'
71229f2c85 Merge branch 'backport-3.17-FindPython-check-specified-version' into FindPython-check-specified-version
e1c869906c FindPython: ensure any specified version is correctly handled
25978c7a00 FindPython: ensure any specified version is correctly handled

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !4718
2020-05-08 08:02:24 -04:00
Hong Xu 36a6d91011 Help: If a cache variable exists, option() also does nothing
The previous text sounded as if option() does some work when a
cache variable exists.
2020-05-08 18:30:27 +10:00
Kitware Robot b9350813f3 CMake Nightly Date Stamp 2020-05-08 00:01:13 -04:00
Ben Boeckel 50cbc9b77a gitlab-ci: add a sphinx builder 2020-05-07 13:25:58 -04:00
Ben Boeckel d78bf2f229 ci: install sphinx into the CI image 2020-05-07 13:25:57 -04:00
Ben Boeckel 671ff5f1ac ci: skip weak dependencies in the CI image 2020-05-07 13:25:57 -04:00
Ben Boeckel bdce0fc317 CTestCustom: fix indentation 2020-05-07 13:25:57 -04:00
Ben Boeckel e4f398e0af Help: add alt text to embedded images 2020-05-07 13:25:57 -04:00
Ben Boeckel 758ab4dbd3 Utilities/Sphinx: allow CDash submission for the standalone build 2020-05-07 13:25:57 -04:00
Ben Boeckel 16de8e3544 Utilities/Sphinx: support finding Qt5's qcollectiongenerator too 2020-05-07 13:25:57 -04:00