From 1f92f153a6ca152cfea5e982f0b6521d157e891d Mon Sep 17 00:00:00 2001 From: Sascha Kratky Date: Sun, 6 May 2012 22:03:56 +0200 Subject: [PATCH] cotire 1.1.2 --- CMake/cotire.cmake | 18 ++++++++++-------- HISTORY.md | 4 ++++ 2 files changed, 14 insertions(+), 8 deletions(-) diff --git a/CMake/cotire.cmake b/CMake/cotire.cmake index e8eadc8..3cd4c05 100644 --- a/CMake/cotire.cmake +++ b/CMake/cotire.cmake @@ -37,7 +37,7 @@ set(__COTIRE_INCLUDED TRUE) cmake_minimum_required(VERSION 2.8.6) set (COTIRE_CMAKE_MODULE_FILE "${CMAKE_CURRENT_LIST_FILE}") -set (COTIRE_CMAKE_MODULE_VERSION "1.1.1") +set (COTIRE_CMAKE_MODULE_VERSION "1.1.2") include(CMakeParseArguments) @@ -93,13 +93,15 @@ endfunction() macro (cotire_check_is_path_relative_to _path _isRelativeVar) set (${_isRelativeVar} FALSE) - foreach (_dir ${ARGN}) - file (RELATIVE_PATH _relPath "${_dir}" "${_path}") - if (NOT _relPath OR (NOT IS_ABSOLUTE "${_relPath}" AND NOT "${_relPath}" MATCHES "^\\.\\.")) - set (${_isRelativeVar} TRUE) - break() - endif() - endforeach() + if (IS_ABSOLUTE "${_path}") + foreach (_dir ${ARGN}) + file (RELATIVE_PATH _relPath "${_dir}" "${_path}") + if (NOT _relPath OR (NOT IS_ABSOLUTE "${_relPath}" AND NOT "${_relPath}" MATCHES "^\\.\\.")) + set (${_isRelativeVar} TRUE) + break() + endif() + endforeach() + endif() endmacro() function (cotire_filter_language_source_files _language _sourceFilesVar _excludedSourceFilesVar _cotiredSourceFilesVar) diff --git a/HISTORY.md b/HISTORY.md index 0ad5039..603d7f1 100644 --- a/HISTORY.md +++ b/HISTORY.md @@ -1,3 +1,7 @@ +## 1.1.2 (2012-05-06) + +* make handling of include directories more robust agains invalid paths. + ## 1.1.1 (2012-04-20) * fixed bug with generation of unity targets for `WIN32_EXECUTABLE` targets.