From 41fb7d649d3de7ad9a77d7e37cfc02014ae177a7 Mon Sep 17 00:00:00 2001 From: Aokromes Date: Thu, 9 Jun 2016 07:51:34 +0200 Subject: [PATCH] Fix pch run --- cmake/macros/FindPCHSupport.cmake | 11 +++++++++-- 1 file changed, 9 insertions(+), 2 deletions(-) diff --git a/cmake/macros/FindPCHSupport.cmake b/cmake/macros/FindPCHSupport.cmake index 6edc8e92890..290789f43a0 100644 --- a/cmake/macros/FindPCHSupport.cmake +++ b/cmake/macros/FindPCHSupport.cmake @@ -26,8 +26,15 @@ FUNCTION(GET_COMMON_PCH_PARAMS TARGET_NAME_LIST PCH_HEADER PCH_FE INCLUDE_PREFIX CollectIncludes(${TARGET_NAME} TARGET_INCLUDES TARGET_DEFINITIONS) ENDFOREACH() - LIST(REMOVE_DUPLICATES TARGET_INCLUDES) - LIST(REMOVE_DUPLICATES TARGET_DEFINITIONS) + IF (PARENT_PACKAGE_INCLUDE_DIRS) + LIST(REMOVE_DUPLICATES TARGET_INCLUDES) + ENDIF() + IF (PARENT_PACKAGE_LIBRARY_DIRS) + LIST(REMOVE_DUPLICATES TARGET_DEFINITIONS) + ENDIF() + # NOTE: Above, in the rare case that none of the subpackages contain any + # libraries or any include directories, we need to not call + # LIST(REMOVE_DUPLICATES ...). FOREACH(ITEM ${TARGET_INCLUDES}) LIST(APPEND INCLUDE_FLAGS_LIST "${INCLUDE_PREFIX}\"${ITEM}\" ")