From 9ab2aba91af8ba9481df74bae8f43d8151f1d955 Mon Sep 17 00:00:00 2001 From: Sascha Kratky Date: Sun, 18 Jan 2015 19:56:45 +0100 Subject: [PATCH] cotire 1.6.9 --- CMake/cotire.cmake | 4 ++-- HISTORY.md | 4 ++++ 2 files changed, 6 insertions(+), 2 deletions(-) diff --git a/CMake/cotire.cmake b/CMake/cotire.cmake index abfe245..0babbd5 100644 --- a/CMake/cotire.cmake +++ b/CMake/cotire.cmake @@ -52,7 +52,7 @@ if (NOT CMAKE_VERSION VERSION_LESS "3.1.0") endif() set (COTIRE_CMAKE_MODULE_FILE "${CMAKE_CURRENT_LIST_FILE}") -set (COTIRE_CMAKE_MODULE_VERSION "1.6.8") +set (COTIRE_CMAKE_MODULE_VERSION "1.6.9") include(CMakeParseArguments) include(ProcessorCount) @@ -925,7 +925,7 @@ macro (cotire_parse_line _line _headerFileVar _headerDepthVar) # English: "Note: including file: C:\directory\file" # German: "Hinweis: Einlesen der Datei: C:\directory\file" # We use a very general regular expression, relying on the presence of the : characters - if (_line MATCHES ":( +)([^:]+:[^:]+)$") + if (_line MATCHES "( +)([a-zA-Z]:[^:]+)$") # Visual Studio compiler output string (LENGTH "${CMAKE_MATCH_1}" ${_headerDepthVar}) get_filename_component(${_headerFileVar} "${CMAKE_MATCH_2}" ABSOLUTE) diff --git a/HISTORY.md b/HISTORY.md index 12e7a2f..dd2e3f5 100644 --- a/HISTORY.md +++ b/HISTORY.md @@ -1,3 +1,7 @@ +## 1.6.9 (2015-01-18) + +* fix bug with parsing of localized MSVC `/showIncludes` output. + ## 1.6.8 (2014-12-28) * fix bug with generation of unity source file segments for parallel builds.