Kaynağa Gözat

Merge pull request #36 from nickhutchinson/master

Fix `-isystem` includes being incorrectly passed to execute_process()
master
Sascha Kratky 9 yıl önce
ebeveyn
işleme
775e716f44
1 değiştirilmiş dosya ile 2 ekleme ve 2 silme
  1. +2
    -2
      CMake/cotire.cmake

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

@@ -759,7 +759,7 @@ macro (cotire_add_includes_to_cmd _cmdVar _language _includeSystemFlag _includes
else()
list(FIND ${_systemIncludesVar} ${_include} _index)
if(_index GREATER -1 AND NOT "${_includeSystemFlag}" STREQUAL "")
list (APPEND ${_cmdVar} "${_includeSystemFlag} ${_include}")
list (APPEND ${_cmdVar} "${_includeSystemFlag}${_include}")
else()
list (APPEND ${_cmdVar} "-I${_include}")
endif()
@@ -1922,7 +1922,7 @@ function (cotire_generate_target_script _language _configurations _targetSourceD
get_target_property(COTIRE_TARGET_MAXIMUM_NUMBER_OF_INCLUDES ${_target} COTIRE_UNITY_SOURCE_MAXIMUM_NUMBER_OF_INCLUDES)
cotire_get_source_files_undefs(COTIRE_UNITY_SOURCE_PRE_UNDEFS COTIRE_TARGET_SOURCES_PRE_UNDEFS ${COTIRE_TARGET_SOURCES})
cotire_get_source_files_undefs(COTIRE_UNITY_SOURCE_POST_UNDEFS COTIRE_TARGET_SOURCES_POST_UNDEFS ${COTIRE_TARGET_SOURCES})
set (COTIRE_INCLUDE_SYSTEM_FLAG ${CMAKE_INCLUDE_SYSTEM_FLAG_${_language}})
string (STRIP "${CMAKE_INCLUDE_SYSTEM_FLAG_${_language}}" COTIRE_INCLUDE_SYSTEM_FLAG)
set (COTIRE_TARGET_CONFIGURATION_TYPES "${_configurations}")
foreach (_config ${_configurations})
string (TOUPPER "${_config}" _upperConfig)


Yükleniyor…
İptal
Kaydet