mirror/CMake
1
0
Fork 0
mirror of https://github.com/Kitware/CMake.git synced 2026-05-07 22:59:56 -05:00
Code Issues Packages Projects Releases Wiki Activity
48,249 Commits 2 Branches 401 Tags
a1b1fc611bc8aeb519b79b3e1b86ce4e4dbc55e9
Commit Graph

48249 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
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
Robert Maynard 9f4eb352fe Unity Builds: Support explicit specification of sources to groups 
Instead of having CMake determine which files should go into each
unity file, the user can now use explicitly state the mapping.
 2020-05-07 11:13:34 -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
Robert Maynard b00585adcc Unity: Refactor implementation to make it easier to extend 2020-05-06 15:56:16 -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
Brad King 4ec59891ad Merge topic 'CheckLanguage-cuda-host' into release-3.17 
5b304a7503 CheckLanguage: Fix forwarding of CMAKE_CUDA_HOST_COMPILER

Acked-by: Kitware Robot <kwrobot@kitware.com>
Acked-by: Robert Maynard <robert.maynard@kitware.com>
Merge-request: !4711
 2020-05-06 09:27:13 -04:00
Brad King 84c49ff5d1 Merge branch 'release-3.17' 2020-05-06 09:27:13 -04:00
Brad King 1cadb625f2 Merge topic 'CheckLanguage-cuda-host' 
5b304a7503 CheckLanguage: Fix forwarding of CMAKE_CUDA_HOST_COMPILER

Acked-by: Kitware Robot <kwrobot@kitware.com>
Acked-by: Robert Maynard <robert.maynard@kitware.com>
Merge-request: !4711
 2020-05-06 09:27:13 -04:00
Brad King 2e831e4a17 Windows: Normalize slashes in compiler -print-sysroot path 
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
 2020-05-06 08:25:58 -04:00
Brad King 6687a82000 Merge branch 'backport-3.16-FindPkgConfig-isystem' into release-3.16 
Merge-request: !4693
 2020-05-06 07:50:20 -04:00
Brad King 502e562940 Merge branch 'backport-3.17-FindPkgConfig-isystem' into FindPkgConfig-isystem 2020-05-06 07:48:23 -04:00
Brad King e9d93c3731 Help: Add 3.17 release note for FindPkgConfig '-isystem' fix 2020-05-06 07:46:35 -04:00
Brad King dfaaae67a3 Merge branch 'backport-3.16-FindPkgConfig-isystem' 2020-05-06 07:45:55 -04:00
Alex Turbov e4f1b301fe cmake: Allow arbitrary args passed to CMake script 2020-05-06 21:40:36 +10:00
Kitware Robot 00065e2087 CMake Nightly Date Stamp 2020-05-06 00:01:16 -04:00
Brad King 7670ba8b0a Utilities/Release: Drop win{32,64} scripts in favor of docker build 
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).
 2020-05-05 14:56:56 -04:00
Brad King ff929badb3 Utilities/Release: Add docker specs to build and test Windows binaries 
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`.
 2020-05-05 14:56:26 -04:00
Brad King 5f4f7e637a Utilities/Release: Generalize OS in README docker instructions 
Replace the hard-coded OS name `linux` with an `<os>` placeholder.
Mention `linux` in an explicit list of supported `<os>/<arch>` pairs.
 2020-05-05 14:50:26 -04:00
Brad King 13467f1dbd Utilities/Release: Make README docker examples more readable 
Hard-code them for `linux/x86_64` instead of using an `<arch>`
placeholder.  Update the prose to mention the platform/arch explicitly.
 2020-05-05 14:45:53 -04:00
Brad King 593c3fa1d4 Utilities/Release: Remove unused linux/x86_64/test/cache-ninja.txt 2020-05-05 14:37:04 -04:00
Issam Maghni 3e874e8834 bootstrap: Prefer “test … && test …” over “test … -a …” 
From https://pubs.opengroup.org/onlinepubs/9699919799/utilities/test.html
 2020-05-05 12:42:40 -04:00