diff --git a/CMake/cotire.cmake b/CMake/cotire.cmake index 6260bbe..bb9feab 100644 --- a/CMake/cotire.cmake +++ b/CMake/cotire.cmake @@ -44,7 +44,7 @@ if (NOT CMAKE_SCRIPT_MODE_FILE) endif() set (COTIRE_CMAKE_MODULE_FILE "${CMAKE_CURRENT_LIST_FILE}") -set (COTIRE_CMAKE_MODULE_VERSION "1.1.6") +set (COTIRE_CMAKE_MODULE_VERSION "1.1.7") include(CMakeParseArguments) @@ -810,7 +810,11 @@ function (cotire_parse_includes _language _scanOutput _ignoredIncudeDirs _honore # prevent CMake macro invocation errors due to backslash characters in Windows paths string (REPLACE "\\" "/" _scanOutput "${_scanOutput}") endif() + # canonize slashes + string (REPLACE "//" "/" _scanOutput "${_scanOutput}") + # prevent semicolon from being interpreted as a line separator string (REPLACE ";" "\\;" _scanOutput "${_scanOutput}") + # then separate lines string (REGEX REPLACE "\n" ";" _scanOutput "${_scanOutput}") list (LENGTH _scanOutput _len) # remove duplicate lines to speed up parsing diff --git a/HISTORY.md b/HISTORY.md index c2e9dda..5eb9a03 100644 --- a/HISTORY.md +++ b/HISTORY.md @@ -1,3 +1,7 @@ +## 1.1.7 (2012-10-26) + +* cope with double slash characters in scanned include paths. + ## 1.1.6 (2012-09-22) * check result code upon scanning includes.