Skip to content

Commit

Permalink
cotire 1.1.8
Browse files Browse the repository at this point in the history
  • Loading branch information
sakra committed Oct 27, 2012
1 parent ed34001 commit 938d8dd
Show file tree
Hide file tree
Showing 2 changed files with 10 additions and 2 deletions.
8 changes: 6 additions & 2 deletions CMake/cotire.cmake
Original file line number Diff line number Diff line change
Expand Up @@ -44,7 +44,7 @@ if (NOT CMAKE_SCRIPT_MODE_FILE)
endif()

set (COTIRE_CMAKE_MODULE_FILE "${CMAKE_CURRENT_LIST_FILE}")
set (COTIRE_CMAKE_MODULE_VERSION "1.1.7")
set (COTIRE_CMAKE_MODULE_VERSION "1.1.8")

include(CMakeParseArguments)

Expand Down Expand Up @@ -1709,6 +1709,10 @@ function (cotire_setup_unity_generation_commands _language _target _targetScript
if (_dependencySources)
set_property (SOURCE "${_unityFile}" PROPERTY OBJECT_DEPENDS ${_dependencySources})
endif()
if (MSVC)
# unity file compilation results in potentially huge object file, thus use /bigobj by default unter MSVC
set_property (SOURCE "${_unityFile}" APPEND_STRING PROPERTY COMPILE_FLAGS " /bigobj ")
endif()
cotire_set_cmd_to_prologue(_unityCmd)
list (APPEND _unityCmd -P "${COTIRE_CMAKE_MODULE_FILE}" "unity" "${_targetScript}" "${_unityFile}")
if (COTIRE_DEBUG)
Expand Down Expand Up @@ -2219,7 +2223,7 @@ function (cotire_target _target)
# trivial checks
get_target_property(_imported ${_target} IMPORTED)
if (_imported)
message (WARNING "Imported target ${_target} cannot be cotired")
message (WARNING "Imported target ${_target} cannot be cotired.")
return()
endif()
# check if target needs to be cotired for build type
Expand Down
4 changes: 4 additions & 0 deletions HISTORY.md
Original file line number Diff line number Diff line change
@@ -1,3 +1,7 @@
## 1.1.8 (2012-10-27)

* when using MSVC, apply option `/bigobj` to compilation of generated unity files.

## 1.1.7 (2012-10-26)

* cope with double slash characters in scanned include paths.
Expand Down

0 comments on commit 938d8dd

Please sign in to comment.