summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Merge topic 'doc-option-existing-var'Craig Scott2020-05-101-1/+1
|\ | | | | | | | | | | | | 36a6d91011 Help: If a cache variable exists, option() also does nothing Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !4721
| * Help: If a cache variable exists, option() also does nothingHong Xu2020-05-081-1/+1
| | | | | | | | | | The previous text sounded as if option() does some work when a cache variable exists.
* | CMake Nightly Date StampKitware Robot2020-05-101-1/+1
| |
* | CMake Nightly Date StampKitware Robot2020-05-091-1/+1
| |
* | Merge topic 'sphinx-builder-linux-3.17'Brad King2020-05-081-0/+1
|\ \ | | | | | | | | | | | | | | | | | | 20fbf69f67 gitlab-ci: add linux-3.17 tag to the sphinx build Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !4722
| * | gitlab-ci: add linux-3.17 tag to the sphinx buildBen Boeckel2020-05-081-0/+1
|/ / | | | | | | | | | | | | | | 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.
* | Merge topic 'install-rpath-escape-doc'Brad King2020-05-081-0/+4
|\ \ | | | | | | | | | | | | | | | | | | 495951ea68 Help: Mention CMP0095 in INSTALL_RPATH documentation Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !4720
| * | Help: Mention CMP0095 in INSTALL_RPATH documentationKyle Edwards2020-05-071-0/+4
| |/
* | Merge topic 'third-parties-layout'Brad King2020-05-08129-286/+306
|\ \ | | | | | | | | | | | | | | | | | | | | | 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
| * | Refactoring: Third-parties public headers are under cm3p prefixMarc Chevrier2020-05-07128-284/+300
| | | | | | | | | | | | Fixes: #20666
| * | bootstrap: update list of problematic filesMarc Chevrier2020-05-071-2/+6
| | |
* | | Merge branch 'release-3.17'Brad King2020-05-080-0/+0
|\ \ \
| * \ \ Merge branch 'backport-3.17-FindPython-check-specified-version' into ↵Brad King2020-05-083-43/+222
| |\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | release-3.17 Merge-request: !4718
* | \ \ \ Merge topic 'gitlab-ci-sphinx'Brad King2020-05-089-4/+69
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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
| * | | | | gitlab-ci: add a sphinx builderBen Boeckel2020-05-073-1/+39
| | | | | |
| * | | | | ci: install sphinx into the CI imageBen Boeckel2020-05-071-0/+6
| | | | | |
| * | | | | ci: skip weak dependencies in the CI imageBen Boeckel2020-05-071-1/+1
| | | | | |
| * | | | | CTestCustom: fix indentationBen Boeckel2020-05-071-1/+1
| | | | | |
| * | | | | Help: add alt text to embedded imagesBen Boeckel2020-05-071-0/+5
| | | | | |
| * | | | | Utilities/Sphinx: allow CDash submission for the standalone buildBen Boeckel2020-05-072-0/+16
| | | | | |
| * | | | | Utilities/Sphinx: support finding Qt5's qcollectiongenerator tooBen Boeckel2020-05-071-1/+1
| | |_|_|/ | |/| | |
* | | | | Merge topic 'docker-rel-win'Brad King2020-05-0821-136/+481
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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
| * | | | | Utilities/Release: Drop win{32,64} scripts in favor of docker buildBrad King2020-05-054-115/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Also drop the `CMakeNightlyWin{32,64}` tests that use the scripts. Follow the pattern from commit 689fdbfc61 (Utilities/Release: Drop linux64 script in favor of docker build, 2019-08-27, v3.16.0-rc1~184^2).
| * | | | | Utilities/Release: Add docker specs to build and test Windows binariesBrad King2020-05-0516-2/+462
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | These will allow anyone to produce portable binaries like those published on `cmake.org`. Follow the pattern from commit facc240a45 (Utilities/Release: Add docker specs to build and test Linux binaries, 2019-08-23, v3.16.0-rc1~184^2~2). Parameterize the architecture to support both `x86_64` and `i386`.
| * | | | | Utilities/Release: Generalize OS in README docker instructionsBrad King2020-05-051-9/+13
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Replace the hard-coded OS name `linux` with an `<os>` placeholder. Mention `linux` in an explicit list of supported `<os>/<arch>` pairs.
| * | | | | Utilities/Release: Make README docker examples more readableBrad King2020-05-051-7/+7
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Hard-code them for `linux/x86_64` instead of using an `<arch>` placeholder. Update the prose to mention the platform/arch explicitly.
| * | | | | Utilities/Release: Remove unused linux/x86_64/test/cache-ninja.txtBrad King2020-05-051-4/+0
| | | | | |
* | | | | | Merge branch 'release-3.17'Brad King2020-05-080-0/+0
|\ \ \ \ \ \ | | |_|/ / / | |/| | | |
| * | | | | Merge topic 'pch-reuse-multi' into release-3.17Brad King2020-05-081-1/+3
| |\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 7a1c7736cb PCH: Fix REUSE_FROM in multi-config generators Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !4717
* | \ \ \ \ \ Merge topic 'pch-reuse-multi'Brad King2020-05-081-1/+3
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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
| * \ \ \ \ \ \ Merge branch 'backport-pch-reuse-multi' into pch-reuse-multiBrad King2020-05-070-0/+0
| |\ \ \ \ \ \ \ | | | |/ / / / / | | |/| | | | |
| | * | | | | | PCH: Fix REUSE_FROM in multi-config generatorsAndreas Schönle2020-05-071-1/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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
| * | | | | | | PCH: Fix REUSE_FROM in multi-config generatorsAndreas Schönle2020-05-071-1/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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
* | | | | | | | Merge topic 'FindPython-check-specified-version'Brad King2020-05-083-47/+215
|\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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
| * \ \ \ \ \ \ \ Merge branch 'backport-3.17-FindPython-check-specified-version' into ↵Marc Chevrier2020-05-072-0/+149
| |\ \ \ \ \ \ \ \ | | | |_|_|_|_|/ / | | |/| | | | | | | | | | | | | | | FindPython-check-specified-version
| | * | | | | | | FindPython: ensure any specified version is correctly handledMarc Chevrier2020-05-073-43/+222
| | | |_|/ / / / | | |/| | | | | | | | | | | | | | | | | | | | | Fixes: #20674
| * | | | | | | FindPython: ensure any specified version is correctly handledMarc Chevrier2020-05-071-47/+66
| | |_|_|_|_|/ | |/| | | | | | | | | | | | | | | | | | | Fixes: #20674
* | | | | | | CMake Nightly Date StampKitware Robot2020-05-081-1/+1
| |_|_|_|_|/ |/| | | | |
* | | | | | Merge topic 'ow-mult-platforms'Brad King2020-05-0710-6/+119
|\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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
| * | | | | | OpenWatcom: Add cross-compilation support for WindowsJiri Malak2020-05-061-2/+11
| | | | | | | | | | | | | | | | | | | | | | | | | | | | Add system header files directories for cross-compilation
| * | | | | | OpenWatcom: Fix Linux support fileJiri Malak2020-05-061-4/+13
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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
| * | | | | | OpenWatcom: Add OS/2 target supportJiri Malak2020-05-064-0/+51
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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.
| * | | | | | OpenWatcom: Add DOS target supportJiri Malak2020-05-064-0/+44
| | |_|/ / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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.
* | | | | | Merge topic 'FindVulkan-use-SDK-env-variable'Brad King2020-05-071-8/+15
|\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 590cde6125 FindVulkan: Prefer VULKAN_SDK env var before standard paths on UNIX Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !4714
| * | | | | | FindVulkan: Prefer VULKAN_SDK env var before standard paths on UNIXPatric Schmitz2020-05-061-8/+15
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Also document the variable. Fixes: #18346
* | | | | | | Merge topic 'compiler-sysroot-slashes'Brad King2020-05-071-1/+2
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 2e831e4a17 Windows: Normalize slashes in compiler -print-sysroot path Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !4715
| * | | | | | | Windows: Normalize slashes in compiler -print-sysroot pathBrad King2020-05-061-1/+2
| |/ / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Since commit 8cc384f629 (Compilers: Add paths from -print-sysroot to system prefix path, 2020-03-25) we detect the compiler `-print-sysroot` output and save it. On Windows, the value may include backslashes. Convert the path to CMake's forward-slash convention for storage. Fixes: #20679
* | | | | | | Merge topic 'script-mode-and-arbitrary-args'Craig Scott2020-05-074-2/+16
|\ \ \ \ \ \ \ | |_|_|/ / / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | e4f1b301fe cmake: Allow arbitrary args passed to CMake script Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !4707
| * | | | | | cmake: Allow arbitrary args passed to CMake scriptAlex Turbov2020-05-064-2/+16
| | | | | | |
* | | | | | | CMake Nightly Date StampKitware Robot2020-05-071-1/+1
| |_|/ / / / |/| | | | |