Kaynağa Gözat

cotire 1.5.1

master
Sascha Kratky 10 yıl önce
ebeveyn
işleme
845e0a4497
2 değiştirilmiş dosya ile 9 ekleme ve 5 silme
  1. +5
    -5
      CMake/cotire.cmake
  2. +4
    -0
      HISTORY.md

+ 5
- 5
CMake/cotire.cmake Dosyayı Görüntüle

@@ -45,7 +45,7 @@ if (NOT CMAKE_SCRIPT_MODE_FILE)
endif()

set (COTIRE_CMAKE_MODULE_FILE "${CMAKE_CURRENT_LIST_FILE}")
set (COTIRE_CMAKE_MODULE_VERSION "1.5.0")
set (COTIRE_CMAKE_MODULE_VERSION "1.5.1")

include(CMakeParseArguments)
include(ProcessorCount)
@@ -564,7 +564,7 @@ function (cotire_get_source_extra_properties _sourceFile _pattern _resultVar)
math (EXPR _len "${_len} - 1")
foreach (_index RANGE ${_index} ${_len})
list (GET _extraProperties ${_index} _value)
if ("${_value}" MATCHES "${_pattern}")
if (_value MATCHES "${_pattern}")
list (APPEND _result "${_value}")
else()
break()
@@ -793,7 +793,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 ":( +)([^:]+:[^:]+)$")
# Visual Studio compiler output
string (LENGTH "${CMAKE_MATCH_1}" ${_headerDepthVar})
get_filename_component(${_headerFileVar} "${CMAKE_MATCH_2}" ABSOLUTE)
@@ -802,7 +802,7 @@ macro (cotire_parse_line _line _headerFileVar _headerDepthVar)
set (${_headerDepthVar} 0)
endif()
else()
if ("${_line}" MATCHES "^(\\.+) (.*)$")
if (_line MATCHES "^(\\.+) (.*)$")
# GCC like output
string (LENGTH "${CMAKE_MATCH_1}" ${_headerDepthVar})
if (IS_ABSOLUTE "${CMAKE_MATCH_2}")
@@ -1077,7 +1077,7 @@ function (cotire_generate_unity_source _unityFile)
list (APPEND _compileUndefinitions ${_option_POST_UNDEFS})
endif()
foreach (_definition ${_compileDefinitions})
if ("${_definition}" MATCHES "^([a-zA-Z0-9_]+)=(.+)$")
if (_definition MATCHES "^([a-zA-Z0-9_]+)=(.+)$")
list (APPEND _contents "#define ${CMAKE_MATCH_1} ${CMAKE_MATCH_2}")
list (INSERT _compileUndefinitions 0 "${CMAKE_MATCH_1}")
else()


+ 4
- 0
HISTORY.md Dosyayı Görüntüle

@@ -1,3 +1,7 @@
## 1.5.1 (2013-11-12)

* fixed string quoting bugs.

## 1.5.0 (2013-10-13)

* CMake 2.8.12 compatibility fixes.


Yükleniyor…
İptal
Kaydet