Sascha Kratky 13 лет назад
Родитель
Сommit
1efc6d24a8
2 измененных файлов: 9 добавлений и 4 удалений
  1. +4
    -4
      CMake/cotire.cmake
  2. +5
    -0
      HISTORY.md

+ 4
- 4
CMake/cotire.cmake Просмотреть файл

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


set (COTIRE_CMAKE_MODULE_FILE "${CMAKE_CURRENT_LIST_FILE}") set (COTIRE_CMAKE_MODULE_FILE "${CMAKE_CURRENT_LIST_FILE}")
set (COTIRE_CMAKE_MODULE_VERSION "1.3.3")
set (COTIRE_CMAKE_MODULE_VERSION "1.3.4")


include(CMakeParseArguments) include(CMakeParseArguments)


@@ -523,8 +523,8 @@ function (cotire_get_target_compiler_flags _config _language _directory _target
cotire_get_target_compile_flags("${_config}" "${_language}" "${_directory}" "${_target}" _targetFlags) cotire_get_target_compile_flags("${_config}" "${_language}" "${_directory}" "${_target}" _targetFlags)
set (_compilerFlags "") set (_compilerFlags "")
cotire_filter_compile_flags("${_language}" "[ID]" _ignore _compilerFlags ${_targetFlags}) cotire_filter_compile_flags("${_language}" "[ID]" _ignore _compilerFlags ${_targetFlags})
if (COTIRE_DEBUG AND _compileFlags)
message (STATUS "Target ${_target} compiler flags ${_compileFlags}")
if (COTIRE_DEBUG AND _compilerFlags)
message (STATUS "Target ${_target} compiler flags ${_compilerFlags}")
endif() endif()
set (${_compilerFlagsVar} ${_compilerFlags} PARENT_SCOPE) set (${_compilerFlagsVar} ${_compilerFlags} PARENT_SCOPE)
endfunction() endfunction()
@@ -2335,7 +2335,7 @@ function (cotire_setup_unity_build_target _languages _configurations _targetSour
get_property(_outputDir TARGET ${_target} PROPERTY ${_property}) get_property(_outputDir TARGET ${_target} PROPERTY ${_property})
if (_outputDir) if (_outputDir)
get_filename_component(_outputDir "${_outputDir}/${COTIRE_UNITY_OUTPUT_DIRECTORY}" ABSOLUTE) get_filename_component(_outputDir "${_outputDir}/${COTIRE_UNITY_OUTPUT_DIRECTORY}" ABSOLUTE)
set_property(TARGET ${_target} PROPERTY ${_property} "${_outputDir}")
set_property(TARGET ${_unityTargetName} PROPERTY ${_property} "${_outputDir}")
set (_setDefaultOutputDir FALSE) set (_setDefaultOutputDir FALSE)
endif() endif()
endforeach() endforeach()


+ 5
- 0
HISTORY.md Просмотреть файл

@@ -1,3 +1,8 @@
## 1.3.4 (2013-02-07)

* fixed bug with computing to output directory of the generated unity target (thanks shaunew).
* fixed wrong variable reference in debugging output (thanks shaunew).

## 1.3.3 (2013-02-03) ## 1.3.3 (2013-02-03)


* fixed bug with handling of policy CMP0018 relating to target property `POSITION_INDEPENDENT_CODE`. * fixed bug with handling of policy CMP0018 relating to target property `POSITION_INDEPENDENT_CODE`.


Загрузка…
Отмена
Сохранить