diff options
| author | David Cole <david.cole@kitware.com> | 2012-06-05 18:21:36 (GMT) |
|---|---|---|
| committer | CMake Topic Stage <kwrobot@kitware.com> | 2012-06-05 18:21:36 (GMT) |
| commit | 7687d557dc9a04c56ca9d9e943ff8e21ac8eb028 (patch) | |
| tree | a9e51af78cba10b79fa1a04cdc92f82e0dfad47d /Modules | |
| parent | 80abbeb3f2fe1cd245633e6ac52caa329f37ae52 (diff) | |
| parent | 3545645c1b01f609496a4fc41e20419dedbbd98d (diff) | |
| download | CMake-7687d557dc9a04c56ca9d9e943ff8e21ac8eb028.zip CMake-7687d557dc9a04c56ca9d9e943ff8e21ac8eb028.tar.gz CMake-7687d557dc9a04c56ca9d9e943ff8e21ac8eb028.tar.bz2 | |
Merge topic 'Ninja-EXPORT_COMPILE_COMMANDS'
3545645 Exclude the CompileCommandOutput test on WIN32.
fbaddf4 Escape the source file to be compiled if required.
db839be Make the CMAKE_EXPORT_COMPILE_COMMANDS option work with Ninja.
8778357 Add newline to the output.
2c04bc0 Move the EscapeJSON method to a sharable location.
Diffstat (limited to 'Modules')
| -rw-r--r-- | Modules/CMakeGenericSystem.cmake | 6 |
1 files changed, 6 insertions, 0 deletions
diff --git a/Modules/CMakeGenericSystem.cmake b/Modules/CMakeGenericSystem.cmake index c733969..0ccbfac 100644 --- a/Modules/CMakeGenericSystem.cmake +++ b/Modules/CMakeGenericSystem.cmake @@ -60,6 +60,12 @@ IF(CMAKE_GENERATOR MATCHES "Makefiles") ENDIF(CMAKE_GENERATOR MATCHES "Unix Makefiles") ENDIF(CMAKE_GENERATOR MATCHES "Makefiles") +IF(CMAKE_GENERATOR MATCHES "Ninja") + SET(CMAKE_EXPORT_COMPILE_COMMANDS OFF CACHE BOOL + "Enable/Disable output of compile commands during generation." + ) + MARK_AS_ADVANCED(CMAKE_EXPORT_COMPILE_COMMANDS) +ENDIF(CMAKE_GENERATOR MATCHES "Ninja") # GetDefaultWindowsPrefixBase # |