From aac82954dac451f36263f85b8f1b113479006c0f Mon Sep 17 00:00:00 2001 From: Stephen Kelly Date: Fri, 8 Feb 2013 00:41:13 +0100 Subject: Include the CMake Extras file and the Macros file only once. As the Extras file can do things like append to a property (as in QtCore for include directories), that is something that should be done only once when the QtCore target is first defined. Change-Id: I5163912bccfda1ff43a02eb01f67ac59e6f6b24b Reviewed-by: Alexander Neundorf Reviewed-by: Stephen Kelly --- mkspecs/features/data/cmake/Qt5BasicConfig.cmake.in | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) (limited to 'mkspecs') diff --git a/mkspecs/features/data/cmake/Qt5BasicConfig.cmake.in b/mkspecs/features/data/cmake/Qt5BasicConfig.cmake.in index 36d0495222..0cdd2cc805 100644 --- a/mkspecs/features/data/cmake/Qt5BasicConfig.cmake.in +++ b/mkspecs/features/data/cmake/Qt5BasicConfig.cmake.in @@ -179,12 +179,12 @@ if (NOT TARGET Qt5::$${CMAKE_MODULE_NAME}) !!ENDIF // CMAKE_RELEASE_TYPE -endif() - !!IF !isEmpty(CMAKE_MODULE_EXTRAS) -include(\"${CMAKE_CURRENT_LIST_DIR}/Qt5$${CMAKE_MODULE_NAME}ConfigExtras.cmake\") + include(\"${CMAKE_CURRENT_LIST_DIR}/Qt5$${CMAKE_MODULE_NAME}ConfigExtras.cmake\") !!ENDIF !!IF !isEmpty(CMAKE_MODULE_MACROS) -include(\"${CMAKE_CURRENT_LIST_DIR}/Qt5$${CMAKE_MODULE_NAME}Macros.cmake\") + include(\"${CMAKE_CURRENT_LIST_DIR}/Qt5$${CMAKE_MODULE_NAME}Macros.cmake\") !!ENDIF + +endif() -- cgit v1.2.3