Brad King authored 3 years ago and Kitware Robot committed 3 years ago

2ae72ef7 Xcode: Enable multi-arch TARGET_OBJECTS genex in [INTERFACE_]LINK_LIBRARIES

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !6161

Craig Scott authored 3 years ago and Kitware Robot committed 3 years ago

26e36111 CPack: Implement new variable CPACK_CUSTOM_INSTALL_VARIABLES

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !6141

This was an oversight in the original implementation.

Brad King authored 3 years ago and Kitware Robot committed 3 years ago

c564a3e3 Ninja: Always compile sources using absolute paths
eb98d451 Ninja: Handle depfiles with absolute paths to generated files in Ninja < 1.7
48471cfd cmNinjaNormalTargetGenerator: Factor out build event byproduct collection
18408c0b cmGlobalNinjaGenerator: Add helper to compute absolute paths for build.ninja
efb8d7b4 cmNinjaTargetGenerator: Reduce string copies in ConvertToNinjaPath wrapper
fb3a5757 cmNinjaTargetGenerator: Rename source file path lookup method for clarity
0f2b1c9d cmNinjaTargetGenerator: Remove GetSourceFilePath call with different semantics
dfc98774 cmNinjaTargetGenerator: Rename local variable for clarity
...

Acked-by: Kitware Robot <kwrobot@kitware.com>
Acked-by: Ben Boeckel <ben.boeckel@kitware.com>
Merge-request: !6148

Brad King authored 3 years ago and Kitware Robot committed 3 years ago

74a2a7a4 Compiler/TI: Restore response file usage for linker

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !6159

The Ninja generator traditionally referenced source files and include
directories using paths relative to the build directory if they could be
expressed without a `../` sequence that leaves the build and source
directories.  For example, when using a `build/` directory inside the
source tree, sources would be compiled as `-c ../src.c` and include
directories would be referenced as `-I ../include`.  This approach
matches the traditional Ninja convention of using relative paths
whenever possible, but has undesirable side effects such as:

* Compiler diagnostic messages may not use absolute paths, making it
  harder for IDEs/editors to find the referenced sources or headers.

* Debug symbols may not use absolute paths, making it harder for
  debuggers to find the referenced sources or headers.

* Different results depending on the path to the build tree relative
  to the source tree.

* Inconsistent with the Makefile generators, which use absolute paths.

Switch to always using absolute paths to reference source files and
include directories on compiler command lines.  While alternative
solutions for diagnostic messages and debug symbols may exist with
specific tooling, this is the simplest and most consistent approach.

Note that a previous attempt to do this in commit 955c2a63 (Ninja: Use
full path for all source files, 2016-08-05, v3.7.0-rc1~275^2) was
reverted by commit 666ad1df (Revert "Ninja: Use full path for all
source files", 2017-02-24, v3.8.0-rc2~9^2) due to problems hooking up
depfile dependencies on generated files.  This time, the changes in
commit 2725ecff (Ninja: Handle depfiles with absolute paths to
generated files, 2021-05-19) should avoid those problems.

Fixes: #13894, #17450

Extend the change from commit 2725ecff (Ninja: Handle depfiles with
absolute paths to generated files, 2021-05-19) to work on versions of
Ninja that do not support implicit outputs.  Specify the absolute paths
as normal outputs on such versions.

Issue: #13894, #21865

This was left out of commit 68e5f92c (cmGlobalNinjaGenerator: Factor
out custom command output collection, 2021-05-18).

The global generator's method returns a reference to a cached value.
Return that from the wrapper too.

The `GetSourceFilePath` method is meant only for compiled sources, and
automatically handles converting it to a path for the Ninja build
manifest.  Rename the method to clarify both.

Reference external object files using `ConvertToNinjaPath` directly.
`GetSourceFilePath` is meant to reference source files to be compiled.

`ConvertToIncludeReference` is only called with absolute paths.
One branch already assumed this.

`GetSourceFilePath` already handles converting to a Ninja path.

Josef Angstenberger authored 3 years ago and Brad King committed 3 years ago

The commit 98fea820 (Compiler/TI: Avoid response file usage for
linker, 2020-07-11, v3.19.0-rc1~495^2) disabled linker file usage by
default.  The previous settings were working, even if not for all cases.
Restore them and add an explanation in a comment.

Issue: #22233

Brad King authored 3 years ago and Kitware Robot committed 3 years ago

49693fab cmexpat: Create expat_config.h in build within CMake itself
bea145eb Merge branch 'upstream-expat' into update-expat
2da34f06 expat 2021-05-23 (a28238bd)
0ac6af44 expat: Update script to get Expat 2.4.1

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !6157

Brad King authored 3 years ago and Kitware Robot committed 3 years ago

a50db66b CPack/WIX: Use language en-US, font Consolas, size 14

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !6155

Brad King authored 3 years ago and Kitware Robot committed 3 years ago

15fda938 FindCUDA: Improve deprecation guidance wording
e16b06f4 FindCUDA: Make the deprecation notice more prominent

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !6153

Brad King authored 3 years ago and Kitware Robot committed 3 years ago

668ba68a FindVulkan: add Vulkan::Headers and Vulkan::glslangValidator targets

Acked-by: Kitware Robot <kwrobot@kitware.com>
Reviewed-by: Ben Boeckel <ben.boeckel@kitware.com>
Merge-request: !6154

Brad King authored 3 years ago and Kitware Robot committed 3 years ago

c3bd5a6a cmake-gui: Unset empty CC,CXX on global generator change

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !6151

Brad King authored 3 years ago and Kitware Robot committed 3 years ago

d96eb552 set(CACHE): do not remove normal variable

Acked-by: Kitware Robot <kwrobot@kitware.com>
Reviewed-by: Ben Boeckel <ben.boeckel@kitware.com>
Merge-request: !6146

Brad King authored 3 years ago and Kitware Robot committed 3 years ago

38f2562d CMP0082: Check EXCLUDE_FROM_ALL property at generate time

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !6158

Brad King authored 3 years ago and Kitware Robot committed 3 years ago

bf75369e Merge branch 'master' into cmp0082-exclude-from-all
38f2562d CMP0082: Check EXCLUDE_FROM_ALL property at generate time

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !6158

Fixes: #22234

Expat 2.4.1 no longer supports compiling without this header.

PCJohn authored 3 years ago and Brad King committed 3 years ago

The `Vulkan::Headers` target complements existing Vulkan::Vulkan target.
It is the same except it omits the Vulkan library which supports
applications that loads the Vulkan library in at runtime.

The `Vulkan::glslangValidator` target provides the glslangValidator
executable which is the tool for converting between shader languages
(GLSL, SPIR-V, etc.).

Jason Erb authored 3 years ago and Brad King committed 3 years ago

Improve rendering of text from `CPACK_RESOURCE_FILE_LICENSE`.

Fixes: #22228

* upstream-expat:
  expat 2021-05-23 (a28238bd)

Kitware Robot authored 3 years ago and Brad King committed 3 years ago

Code extracted from:

    https://github.com/libexpat/libexpat.git

at commit a28238bdeebc087071777001245df1876a11f5ee (R_2_4_1).

Jake Cobb authored 3 years ago and Brad King committed 3 years ago

On subsequent runs of configure from cmake-gui the global generator is
swapped.  So on runs other than the first it was setting CC and CXX to
empty when they were otherwise undefined.

Instead, restore them if non-empty and unset them if empty when changing
the global generator and a previous generator exists.

Fixes: #21449