diff options
| author | Brad King <brad.king@kitware.com> | 2020-04-14 12:15:30 (GMT) |
|---|---|---|
| committer | Brad King <brad.king@kitware.com> | 2020-04-15 12:34:18 (GMT) |
| commit | af7de05853f9ced4703b7dc470f7eb475f1ede9c (patch) | |
| tree | 528954403a46eec04a24492f66c5c46bdf1d2b0a /Source/cmGlobalUnixMakefileGenerator3.cxx | |
| parent | 1639ee70ef7986c4c6ad72db1b2552bcaa5b88fa (diff) | |
| download | CMake-af7de05853f9ced4703b7dc470f7eb475f1ede9c.zip CMake-af7de05853f9ced4703b7dc470f7eb475f1ede9c.tar.gz CMake-af7de05853f9ced4703b7dc470f7eb475f1ede9c.tar.bz2 | |
Makefiles: Do not use '\#' escape sequence with Windows-style make tools
Since commit fbf7a92975 (Makefile: Handle '#' in COMPILE_OPTIONS,
2014-08-12, v3.1.0-rc1~174^2) we escape `#` as `\#` in `flags.make`
variable assignments so that they are not treated as a comment.
Windows-style make tools like NMake do not interpret backslashes
in that way. Other means will be needed to handle `#` in contexts
where it is even possible. The test suite is not covering this
for NMake anyway, and actually has a workaround in `Tests/TryCompile`
for the old behavior, which we can now update.
Diffstat (limited to 'Source/cmGlobalUnixMakefileGenerator3.cxx')
| -rw-r--r-- | Source/cmGlobalUnixMakefileGenerator3.cxx | 6 |
1 files changed, 6 insertions, 0 deletions
diff --git a/Source/cmGlobalUnixMakefileGenerator3.cxx b/Source/cmGlobalUnixMakefileGenerator3.cxx index 582877f..3ace290 100644 --- a/Source/cmGlobalUnixMakefileGenerator3.cxx +++ b/Source/cmGlobalUnixMakefileGenerator3.cxx @@ -117,6 +117,12 @@ void cmGlobalUnixMakefileGenerator3::ComputeTargetObjectDirectory( gt->ObjectDirectory = dir; } +bool cmGlobalUnixMakefileGenerator3::CanEscapeOctothorpe() const +{ + // Make tools that use UNIX-style '/' paths also support '\' escaping. + return this->ForceUnixPaths; +} + void cmGlobalUnixMakefileGenerator3::Configure() { // Initialize CMAKE_EDIT_COMMAND cache entry. |