From aaefd8f10db785ba43951cffefdeb0c14759729d Mon Sep 17 00:00:00 2001 From: Peter Huene Date: Thu, 19 Feb 2015 13:02:24 -0800 Subject: [PATCH] Copy IMPORT_PREFIX and IMPORT_SUFFIX target properties for unity targets. For unity targets, the PREFIX and SUFFIX target properties were being copied so that library output file names would make the non-unity target. However, this wasn't the case for IMPORT_PREFIX and IMPORT_SUFFIX which control the import library file name on Windows. As a result, the unity target and the original target differed in the output file name for import libraries. This fix simply adds IMPORT_PREFIX and IMPORT_SUFFIX to the list of properties being copied from the original target. --- CMake/cotire.cmake | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/CMake/cotire.cmake b/CMake/cotire.cmake index 0babbd5..33703a5 100644 --- a/CMake/cotire.cmake +++ b/CMake/cotire.cmake @@ -2757,7 +2757,8 @@ function (cotire_setup_unity_build_target _languages _configurations _targetSour LIBRARY_OUTPUT_NAME LIBRARY_OUTPUT_NAME_ OUTPUT_NAME OUTPUT_NAME_ RUNTIME_OUTPUT_NAME RUNTIME_OUTPUT_NAME_ - PREFIX _POSTFIX SUFFIX) + PREFIX _POSTFIX SUFFIX + IMPORT_PREFIX IMPORT_SUFFIX) # copy compile stuff cotire_copy_set_properites("${_configurations}" TARGET ${_target} ${_unityTargetName} COMPILE_DEFINITIONS COMPILE_DEFINITIONS_