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 /Tests | |
| 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 'Tests')
| -rw-r--r-- | Tests/CMakeLib/run_compile_commands.cxx | 2 | ||||
| -rw-r--r-- | Tests/CMakeLists.txt | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/Tests/CMakeLib/run_compile_commands.cxx b/Tests/CMakeLib/run_compile_commands.cxx index 3f141c5..434cbee 100644 --- a/Tests/CMakeLib/run_compile_commands.cxx +++ b/Tests/CMakeLib/run_compile_commands.cxx @@ -35,7 +35,7 @@ private: void ParseTranslationUnits() { this->TranslationUnits = TranslationUnitsType(); - ExpectOrDie('[', "at start of compile command file"); + ExpectOrDie('[', "at start of compile command file\n"); do { ParseTranslationUnit(); diff --git a/Tests/CMakeLists.txt b/Tests/CMakeLists.txt index 5972c19..ef707e4 100644 --- a/Tests/CMakeLists.txt +++ b/Tests/CMakeLists.txt @@ -47,7 +47,7 @@ CONFIGURE_FILE(${CMake_SOURCE_DIR}/Tests/EnforceConfig.cmake.in # Testing IF(BUILD_TESTING) - IF("${CMAKE_TEST_GENERATOR}" MATCHES "Unix Makefiles") + IF("${CMAKE_TEST_GENERATOR}" MATCHES "Unix Makefiles" OR ("${CMAKE_TEST_GENERATOR}" MATCHES Ninja AND NOT WIN32)) SET(TEST_CompileCommandOutput 1) ENDIF() |