Commit Graph

81 Commits

Author SHA1 Message Date
Brad King d33b12d84b Add support for build tree symlink inside source tree
Since commit c564a3e3ff (Ninja: Always compile sources using absolute
paths, 2021-05-19, v3.21.0-rc1~129^2), both the Ninja and Makefile
generators pass source files and include directories to the compiler as
absolute paths.  However, in some other contexts within generated build
systems, we generate paths that may be relative or absolute.  In these
contexts, we prefer relative paths, but avoid them when they contain a
`../` sequence that leaves both the build tree and the source tree:

* When the build tree is outside of the source tree, all paths to the
  source tree are absolute.

* When the build tree is inside the source tree, we previously assumed
  that it is a real directory such that exiting the build tree with
  `../` enters the source tree.  This allowed paths to the source
  tree to be relative to the build tree.

In the latter case, we previously did not support using a symbolic link
inside the source tree to point at the build tree.  This is because
relative paths to the source tree would be generated with `../`
sequences leaving the build tree, but they would jump to the parent of
the real build tree, which is not the source tree.

Fix this by requiring that `../` sequences stay inside the build tree
even if its path appears to be inside the source tree.  When the build
tree is inside the source tree, all paths to the source tree are now
absolute.  For consistency, this applies regardless of whether the
path to the build tree contains a symbolic link.

Fixes: #21819
2022-02-28 10:26:04 -05:00
Brad King 43416c48ed cmOutputConverter: Always set relative path top source and binary together
Refactor to set both at once so we have a single place in the code that
knows both have been set.
2022-02-28 10:25:18 -05:00
Clemens Wasser 6f835c3699 cmOutputConverter: Cache Short Paths
Cache the Short Paths since we only convert the same few paths anyway
and calling `GetShortPathNameW` is really expensive.

Also, compile the code path only on Windows hosts since it only runs
when using a Windows Shell anyway.
2022-01-25 04:27:15 -05:00
Brendan O'Rourke 144e8dcf40 cmOutputConverter: Quote hyphens in response files
Fixes: #20070
2021-11-08 12:14:53 -06:00
Kyle Edwards 447fbf061a EscapeForCMake: Add wrapQuotes parameter 2021-10-27 13:27:02 -04:00
Sean McBride 907d098838 Source: Fix clang -Wextra-semi warnings 2021-09-28 09:59:24 -04:00
Marc Chevrier 59ad7a1c24 Move helpers functions from cmStringAlgorithms.h to cmValue.h
Helpers functions related to cmValue semantic are now part of
cmValue.h header.
2021-09-21 18:11:00 +02:00
Brad King 8526756b61 cmOutputConverter: Adopt relative path conversion helpers
Move them up from cmLocalGenerator and out of cmStateDirectory.
2021-05-17 10:04:01 -04:00
Ben Boeckel c826461d9c clang-tidy: fix bugprone-reserved-identifier warnings 2021-01-27 08:45:44 -05:00
Peter Hill b0a6161190 Fortran: Add Fortran_PREPROCESS property
Issue: #18870
2020-05-21 11:44:14 -04:00
Vitaly Stakhovsky 4fd28b9911 cmOutputConverter::GetFortranFormat(): delete const char* overload 2020-04-27 07:38:47 -04:00
Brad King ca343dad07 Makefiles: Convert paths with '#' on command-lines to short path on Windows
In `ConvertToOutputForExisting` we convert paths with spaces to short
paths on Windows for use on command lines, e.g. for include directories.
Do the same for paths with `#` since tools like NMake do not have a way
to reliably put `#` in variable assignments.
2020-04-15 08:34:46 -04:00
Kyle Edwards 5a8a9f7229 Ninja: Add multi-config variant
Co-Authored-by: vector-of-bool <vectorofbool@gmail.com>
2019-12-13 10:51:46 -05:00
Regina Pfeifer f30523d090 clang-tidy: modernize-deprecated-headers 2019-09-16 10:11:13 -04:00
Sebastian Holtermann f4f3c68926 Source code: Use cmExpandList instead of cmSystemTools::ExpandListArgument 2019-08-14 16:33:20 +02:00
Sebastian Holtermann ec892a572b cmOutputConverter: Make shell escaping methods cm::string_view based 2019-07-28 17:48:59 +02:00
Sebastian Holtermann 8573e20c43 cmOutputConverter: Let GetFortranFormat accept a cm::string_view 2019-07-28 17:47:26 +02:00
Sebastian Holtermann 4911762358 cmOutputConverter: Return bool instead of int in utility functions 2019-07-28 17:47:26 +02:00
Sebastian Holtermann a929255dec cmOutputConverter: Let cmOutputConverterIsShellOperator accept cm::string_view 2019-07-28 17:47:26 +02:00
Sebastian Holtermann 1b30b28c04 cmOutputConverter: Let cmOutputConverterIsShellOperator accept cm::string_view 2019-07-28 17:47:26 +02:00
Sebastian Holtermann 6675f785be cmOutputConverter: Let EscapeForCMake accept a cm::string_view 2019-07-28 17:47:26 +02:00
Sebastian Holtermann 0e4493ec67 cmOutputConverter: Initialize static std::set on construction 2019-06-04 18:11:19 +02:00
Bruno Manganelli b6a957c969 cmOutputConverter: move ConvertToRelativePath to cmStateDirectory. 2019-01-27 15:48:57 +00:00
Bruno Manganelli 33f08eec18 cmOutputConverter: Moved ContainedInDirectory to cmStateDirectory 2018-12-08 11:24:06 +00:00
Bruno Manganelli 87e810f223 cmOutputConverter: Moved ForceToRelativePath to cmSystem 2018-12-07 19:29:30 +00:00
Regina Pfeifer 3e60580784 clang-tidy: Fix readability-static-accessed-through-instance
Enable the check in .clang-tidy and fix all warnings.
2018-11-22 00:11:37 +01:00
Cengizhan Pasaoglu c67ab22cdc Using front() and back() instead of calculations 2018-11-06 21:43:33 +03:00
Vitaly Stakhovsky ada121e573 cmStateDirectory: use const std::string& for return values 2018-08-12 18:59:21 +10:00
Rolf Eike Beer ff5823f512 cmOutputConverter: mark helper functions static
This allows the linker to entirely drop any symbols of the functions.
2018-03-06 18:13:33 +01:00
Frank Winklmeier 8ab3660a1e cmOutputConverter: Inline some functions and avoid string re-allocations
Use std::string (with correct initial size) in cmOutputConverter::Shell__GetArgument
instead of ostringstream. This avoids several re-allocations of the
string buffer. In addition, convert some of the private static members into
inline free functions to avoid function calls.
2018-02-23 17:23:10 +01:00
Pavel Solodovnikov 653b894683 Reduce raw string pointers usage.
* Change some functions to take `std::string` instead of
  `const char*` in the following classes: `cmMakeFile`, `cmake`,
  `cmCoreTryCompile`, `cmSystemTools`,  `cmState`, `cmLocalGenerator`
  and a few others.
* Greatly reduce using of `const char*` overloads for
  `cmSystemTools::MakeDirectory` and `cmSystemTools::RelativePath`.
* Remove many redundant `c_str()` conversions throughout the code.
2018-01-31 18:23:03 +03:00
Pavel Solodovnikov 7d5095796a Meta: modernize old-fashioned loops to range-based for.
Changes done via `clang-tidy` with some manual fine-tuning
for the variable naming and `auto` type deduction
where appropriate.
2017-09-12 16:22:47 +03:00
Daniel Pfeifer 190e3825d4 Replace C-style casts 2017-08-27 09:58:46 +02:00
Daniel Pfeifer b1ec5deaf1 Pass large types by const&, small types by value 2017-06-04 00:48:21 +02:00
Daniel Pfeifer 2e620f0b38 Fix several include-what-you-use findings 2016-11-08 09:42:04 -05:00
Stephen Kelly e0a84904eb cmState: Split auxiliary classes into separate files
Port dependents to the new locations as needed.

Leave behind a cmState.h include in cmListFileCache to reduce noise. It
is removed in a following commit.
2016-10-19 15:40:59 +02:00
Stephen Kelly cde6eb6249 cmState: Port dependent code to new cmStateSnapshot name 2016-10-19 15:40:59 +02:00
Stephen Kelly 17d27893e6 cmState: Port dependent code to new cmStateDirectory name 2016-10-19 15:40:58 +02:00
Stephen Kelly fd93b3605b cmOutputConverter: Add a flag for IsUnix
Remove the need for method parameters to represent the distinction.
2016-10-06 20:02:10 +02:00
Stephen Kelly 1365e18b9b Convert: Inline platform-specific methods
They don't provide real value.
2016-10-06 20:02:09 +02:00
Stephen Kelly c3264f48c2 Convert: Extract method to determine if paths are in directory
The conditional early return can be moved to clients, which would have
many benefits, notably making cmOutputConverter independent of
directory-specific state.
2016-10-06 20:02:06 +02:00
Stephen Kelly 52168f3210 Convert: Remove asserts which are duplicated in delegate method
This means that we don't encounter the asserts in the case where we
early-return from here.
2016-10-06 20:02:05 +02:00
Stephen Kelly 5213f8936f Convert: Remove early return check
This function delegates to another function which does the same check.
2016-10-06 20:02:05 +02:00
Stephen Kelly b61c268bd0 Convert: Extract local variables for readability 2016-10-06 20:02:04 +02:00
Stephen Kelly e278f5a848 Convert: Extract local variables
Remove comment made obsolete by them.
2016-10-06 20:02:03 +02:00
Daniel Pfeifer 51bc6bddb9 cmOutputConverter: remove unused code
Remove old ConvertToRelativePath function now that all clients have
migrated to the new signature.
2016-10-06 18:45:18 +02:00
Brad King 86578eccf2 Simplify CMake per-source license notices
Per-source copyright/license notice headers that spell out copyright holder
names and years are hard to maintain and often out-of-date or plain wrong.
Precise contributor information is already maintained automatically by the
version control tool.  Ultimately it is the receiver of a file who is
responsible for determining its licensing status, and per-source notices are
merely a convenience.  Therefore it is simpler and more accurate for
each source to have a generic notice of the license name and references to
more detailed information on copyright holders and full license terms.

Our `Copyright.txt` file now contains a list of Contributors whose names
appeared source-level copyright notices.  It also references version control
history for more precise information.  Therefore we no longer need to spell
out the list of Contributors in each source file notice.

Replace CMake per-source copyright/license notice headers with a short
description of the license and links to `Copyright.txt` and online information
available from "https://cmake.org/licensing".  The online URL also handles
cases of modules being copied out of our source into other projects, so we
can drop our notices about replacing links with full license text.

Run the `Utilities/Scripts/filter-notices.bash` script to perform the majority
of the replacements mechanically.  Manually fix up shebang lines and trailing
newlines in a few files.  Manually update the notices in a few files that the
script does not handle.
2016-09-27 15:14:44 -04:00
Stephen Kelly 6429d6d9dd cmOutputConverter: Remove now-obsolete Convert method 2016-09-19 21:36:15 +02:00
Stephen Kelly 4cf707b083 Convert: Remove HOME_OUTPUT enum value 2016-09-19 21:36:14 +02:00
Stephen Kelly 76833149ec Convert: Simplify switch
Make it more clear what is happening here.
2016-09-19 21:36:14 +02:00