Commit Graph

48065 Commits

Author SHA1 Message Date
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
Kitware Robot d59e65ecc0 CMake Nightly Date Stamp 2020-05-09 00:01:18 -04: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
Kyle Edwards 495951ea68 Help: Mention CMP0095 in INSTALL_RPATH documentation 2020-05-07 11:58:46 -04:00
Brad King a2ee941aba Merge branch 'backport-pch-reuse-multi' into pch-reuse-multi 2020-05-07 09:59:14 -04:00
Andreas Schönle 605d6c65c9 PCH: Fix REUSE_FROM in multi-config generators
Since commit a55df20499 (Multi-Ninja: Add precompile headers support,
2020-01-10, v3.17.0-rc1~136^2) the re-used PCH file object is added
once for each configuration to flags used for all configurations.
Put it in the flags for only the corresponding configuration instead.

Fixes: #20680
2020-05-07 09:58:44 -04:00
Andreas Schönle 7a1c7736cb PCH: Fix REUSE_FROM in multi-config generators
Since commit a55df20499 (Multi-Ninja: Add precompile headers support,
2020-01-10, v3.17.0-rc1~136^2) the re-used PCH file object is added
once for each configuration to flags used for all configurations.
Put it in the flags for only the corresponding configuration instead.

Fixes: #20680
2020-05-07 09:55:04 -04:00
Brad King adef7c09d0 Merge topic 'ow-mult-platforms'
4adfd2a3aa OpenWatcom: Add cross-compilation support for Windows
43c3243c2d OpenWatcom: Fix Linux support file
d26eea220a OpenWatcom: Add OS/2 target support
0ab583d787 OpenWatcom: Add DOS target support

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !4702
2020-05-07 09:35:43 -04:00
Brad King 07d567c0ce Merge topic 'FindVulkan-use-SDK-env-variable'
590cde6125 FindVulkan: Prefer VULKAN_SDK env var before standard paths on UNIX

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !4714
2020-05-07 09:34:41 -04:00
Brad King 0dcb436fab Merge topic 'compiler-sysroot-slashes'
2e831e4a17 Windows: Normalize slashes in compiler -print-sysroot path

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !4715
2020-05-07 09:33:11 -04:00
Craig Scott b743ffbfa2 Merge topic 'script-mode-and-arbitrary-args'
e4f1b301fe cmake: Allow arbitrary args passed to CMake script

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !4707
2020-05-07 09:09:52 -04:00
Marc Chevrier 2faa3f6c55 Refactoring: Third-parties public headers are under cm3p prefix
Fixes: #20666
2020-05-07 12:06:08 +02:00
Marc Chevrier 75e87e3db4 bootstrap: update list of problematic files 2020-05-07 11:56:55 +02:00
Marc Chevrier 71229f2c85 Merge branch 'backport-3.17-FindPython-check-specified-version' into FindPython-check-specified-version 2020-05-07 11:26:22 +02:00
Marc Chevrier e1c869906c FindPython: ensure any specified version is correctly handled
Fixes: #20674
2020-05-07 11:20:43 +02:00
Marc Chevrier 25978c7a00 FindPython: ensure any specified version is correctly handled
Fixes: #20674
2020-05-07 11:19:36 +02:00
Kitware Robot 51d82407fc CMake Nightly Date Stamp 2020-05-07 00:01:12 -04:00
Jiri Malak 4adfd2a3aa OpenWatcom: Add cross-compilation support for Windows
Add system header files directories for cross-compilation
2020-05-06 13:10:43 -04:00
Jiri Malak 43c3243c2d OpenWatcom: Fix Linux support file
Fix CMAKE_SHARED_LINKER_FLAGS_INIT macro
Fix executable file name for Linux to be without extension
Add system header files directory for cross-compilation
2020-05-06 13:09:58 -04:00
Jiri Malak d26eea220a OpenWatcom: Add OS/2 target support
OS/2 16-bit and 32-bit target support files for cross-compilation by
OpenWatcom.

It is used if CMAKE_SYSTEM_NAME=OS2 is defined.

If CMAKE_SYSTEM_PROCESSOR=I86 is defined then 16-bit OS/2 target is
used, otherwise 32-bit OS/2 target is used.
2020-05-06 13:09:28 -04:00
Jiri Malak 0ab583d787 OpenWatcom: Add DOS target support
DOS 16-bit and 32-bit target support files for cross-compilation by
OpenWatcom.

It is used if CMAKE_SYSTEM_NAME=DOS is defined.

If CMAKE_SYSTEM_PROCESSOR=I86 is defined then 16-bit DOS target is used,
otherwise 32-bit DOS target is used.
2020-05-06 13:09:00 -04:00
Patric Schmitz 590cde6125 FindVulkan: Prefer VULKAN_SDK env var before standard paths on UNIX
Also document the variable.

Fixes: #18346
2020-05-06 16:07:49 +02:00
Brad King 8406f71eae Merge topic 'bootstrap-test'
3e874e8834 bootstrap: Prefer “test … && test …” over “test … -a …”
1c06060288 bootstrap: Prefer “test …” over “[ … ]”

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !4704
2020-05-06 09:32:53 -04:00
Brad King b86dfa2056 Merge topic 'gtest-space-in-parameter'
839a1010a3 GoogleTestAddTests: Fix output processing

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !4694
2020-05-06 09:31:53 -04:00
Brad King f6178df27d Merge branch 'release-3.16' 2020-05-06 09:30:49 -04:00
Brad King 27f6eb13a3 Merge branch 'release-3.17' 2020-05-06 09:28:31 -04:00
Brad King 6ccbf6ba71 Merge topic 'FindPkgConfig-isystem' into release-3.17
e9d93c3731 Help: Add 3.17 release note for FindPkgConfig '-isystem' fix
dfaaae67a3 Merge branch 'backport-3.16-FindPkgConfig-isystem'
4d446c68d1 FindPkgConfig: also handle "-isystem" prefixes for include directories

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !4693
2020-05-06 09:28:30 -04:00
Brad King 1aecbda756 Merge topic 'FindPkgConfig-isystem'
502e562940 Merge branch 'backport-3.17-FindPkgConfig-isystem' into FindPkgConfig-isystem
e9d93c3731 Help: Add 3.17 release note for FindPkgConfig '-isystem' fix
dfaaae67a3 Merge branch 'backport-3.16-FindPkgConfig-isystem'
cd31a8acef FindPkgConfig: also handle "-isystem" prefixes for include directories
4d446c68d1 FindPkgConfig: also handle "-isystem" prefixes for include directories

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !4693
2020-05-06 09:28:30 -04:00