diff options
| author | Brad King <brad.king@kitware.com> | 2017-05-31 12:55:40 (GMT) |
|---|---|---|
| committer | Kitware Robot <kwrobot@kitware.com> | 2017-05-31 12:55:44 (GMT) |
| commit | de16ff3e58b0518c707ae877e80b6f81e26a4326 (patch) | |
| tree | 093f58a468bdbf33e4c15ab8073677c0b3b65239 /Tests | |
| parent | 47281310bf610f3ab975d00831e9f3fe713ddde1 (diff) | |
| parent | 6a2f8335638605d34f066f4e1f2fc646e324564e (diff) | |
| download | CMake-de16ff3e58b0518c707ae877e80b6f81e26a4326.zip CMake-de16ff3e58b0518c707ae877e80b6f81e26a4326.tar.gz CMake-de16ff3e58b0518c707ae877e80b6f81e26a4326.tar.bz2 | |
Merge topic 'ninja-mingw'
6a2f8335 Ninja: Fix escaping of path to depfile
781eb380 Tests: Fix VSResource test on MinGW with Ninja and a space in the path
Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !911
Diffstat (limited to 'Tests')
| -rw-r--r-- | Tests/VSResource/CMakeLists.txt | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/Tests/VSResource/CMakeLists.txt b/Tests/VSResource/CMakeLists.txt index 3b9cfc3..ee660ed 100644 --- a/Tests/VSResource/CMakeLists.txt +++ b/Tests/VSResource/CMakeLists.txt @@ -18,9 +18,8 @@ if(CMAKE_RC_COMPILER MATCHES windres) message(STATUS "CMAKE_RC_COMPILER MATCHES windres") add_definitions(/DCMAKE_RCDEFINE=test.txt) add_definitions(/DCMAKE_RCDEFINE_NO_QUOTED_STRINGS) - if(MSYS AND CMAKE_CURRENT_BINARY_DIR MATCHES " ") - # windres cannot handle spaces in include dir, and - # for the MSys shell we do not convert to shortpath. + if(CMAKE_CURRENT_BINARY_DIR MATCHES " ") + # windres cannot handle spaces in include dir set(CMAKE_RC_NO_INCLUDE 1) endif() elseif(MSVC60) |