diff options
| author | Brad King <brad.king@kitware.com> | 2021-01-13 14:20:03 (GMT) |
|---|---|---|
| committer | Kitware Robot <kwrobot@kitware.com> | 2021-01-13 14:20:13 (GMT) |
| commit | 00d8a1dff8e9165c1091059754fce5e99c7f12b7 (patch) | |
| tree | f73149a87f45ad67bcc55948c377be70102008b1 | |
| parent | 82a3b6f89a5e26f600faeae60c1cbe1a036c1b21 (diff) | |
| parent | 4d509437cb23f372845fba98fc8d57887c53fa70 (diff) | |
| download | CMake-00d8a1dff8e9165c1091059754fce5e99c7f12b7.zip CMake-00d8a1dff8e9165c1091059754fce5e99c7f12b7.tar.gz CMake-00d8a1dff8e9165c1091059754fce5e99c7f12b7.tar.bz2 | |
Merge topic 'depend_make_refine'
4d509437cb cmDepends: disable long line dependencies for nmake
Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !5689
| -rw-r--r-- | Source/cmGlobalNMakeMakefileGenerator.cxx | 2 | ||||
| -rw-r--r-- | Tests/IncludeDirectories/CMakeLists.txt | 8 |
2 files changed, 3 insertions, 7 deletions
diff --git a/Source/cmGlobalNMakeMakefileGenerator.cxx b/Source/cmGlobalNMakeMakefileGenerator.cxx index c4bec23..36f583f 100644 --- a/Source/cmGlobalNMakeMakefileGenerator.cxx +++ b/Source/cmGlobalNMakeMakefileGenerator.cxx @@ -21,6 +21,8 @@ cmGlobalNMakeMakefileGenerator::cmGlobalNMakeMakefileGenerator(cmake* cm) this->PassMakeflags = true; this->UnixCD = false; this->MakeSilentFlag = "/nologo"; + // nmake breaks on '!' in long-line dependencies + this->ToolSupportsLongLineDependencies = false; } void cmGlobalNMakeMakefileGenerator::EnableLanguage( diff --git a/Tests/IncludeDirectories/CMakeLists.txt b/Tests/IncludeDirectories/CMakeLists.txt index d980a52..d4c19c7 100644 --- a/Tests/IncludeDirectories/CMakeLists.txt +++ b/Tests/IncludeDirectories/CMakeLists.txt @@ -67,13 +67,7 @@ else() endif() # Test escaping of special characters in include directory paths. -set(special_chars "~@&{}()'") -if(NOT (CMAKE_GENERATOR STREQUAL "NMake Makefiles" AND - "x${CMAKE_C_COMPILER_ID}" STREQUAL "xMSVC" AND - "${CMAKE_C_COMPILER_VERSION}" VERSION_LESS 13.0)) - # NMake from VS 6 mistakes '!' in a path after a line continuation for a directive. - string(APPEND special_chars "!") -endif() +set(special_chars "~@&{}()!'") if(NOT CMAKE_GENERATOR MATCHES "(Unix|MinGW|MSYS) Makefiles") # when compiler is used for dependencies, special characters for make are not escaped string(APPEND special_chars "%") |