|
|
@@ -902,16 +902,16 @@ function (cotire_add_includes_to_cmd _cmdVar _language _includesVar _systemInclu |
|
|
|
foreach (_include ${_includeDirs}) |
|
|
|
if (WIN32 AND CMAKE_${_language}_COMPILER_ID MATCHES "MSVC|Intel") |
|
|
|
file (TO_NATIVE_PATH "${_include}" _include) |
|
|
|
list (APPEND ${_cmdVar} "${CMAKE_INCLUDE_FLAG_${_language}}${CMAKE_INCLUDE_FLAG_${_language}_SEP}${_include}") |
|
|
|
list (APPEND ${_cmdVar} "${CMAKE_INCLUDE_FLAG_${_language}}${CMAKE_INCLUDE_FLAG_SEP_${_language}}${_include}") |
|
|
|
else() |
|
|
|
set (_index -1) |
|
|
|
if ("${CMAKE_INCLUDE_SYSTEM_FLAG_${_language}}" MATCHES ".+") |
|
|
|
list (FIND ${_systemIncludesVar} "${_include}" _index) |
|
|
|
endif() |
|
|
|
if (_index GREATER -1) |
|
|
|
list (APPEND ${_cmdVar} "${CMAKE_INCLUDE_SYSTEM_FLAG_${_language}}${_include}") |
|
|
|
list (APPEND ${_cmdVar} "${CMAKE_INCLUDE_SYSTEM_FLAG_${_language}}${CMAKE_INCLUDE_FLAG_SEP_${_language}}${_include}") |
|
|
|
else() |
|
|
|
list (APPEND ${_cmdVar} "${CMAKE_INCLUDE_FLAG_${_language}}${CMAKE_INCLUDE_FLAG_${_language}_SEP}${_include}") |
|
|
|
list (APPEND ${_cmdVar} "${CMAKE_INCLUDE_FLAG_${_language}}${CMAKE_INCLUDE_FLAG_SEP_${_language}}${_include}") |
|
|
|
endif() |
|
|
|
endif() |
|
|
|
endforeach() |
|
|
@@ -2191,7 +2191,7 @@ function (cotire_generate_target_script _language _configurations _target _targe |
|
|
|
XCODE MSVC CMAKE_GENERATOR CMAKE_BUILD_TYPE CMAKE_CONFIGURATION_TYPES |
|
|
|
CMAKE_${_language}_COMPILER_ID CMAKE_${_language}_COMPILER_VERSION |
|
|
|
CMAKE_${_language}_COMPILER_LAUNCHER CMAKE_${_language}_COMPILER CMAKE_${_language}_COMPILER_ARG1 |
|
|
|
CMAKE_INCLUDE_FLAG_${_language} CMAKE_INCLUDE_FLAG_${_language}_SEP |
|
|
|
CMAKE_INCLUDE_FLAG_${_language} CMAKE_INCLUDE_FLAG_SEP_${_language} |
|
|
|
CMAKE_INCLUDE_SYSTEM_FLAG_${_language} |
|
|
|
CMAKE_${_language}_FRAMEWORK_SEARCH_FLAG |
|
|
|
CMAKE_${_language}_SYSTEM_FRAMEWORK_SEARCH_FLAG |
|
|
|