1berry/qtbase
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Include the extras files after defining the target.

Browse Source 
Allows the extras file to contain references to the target.

Change-Id: I47332c4efcb7ba0132509a41fa3040531cd1c81f
Reviewed-by: Alexander Neundorf <neundorf@kde.org>
Reviewed-by: Stephen Kelly <stephen.kelly@kdab.com>
This commit is contained in:
Stephen Kelly 2011-12-17 00:46:11 +01:00 committed by Qt by Nokia
parent 31d8ecfe3b
commit 5fb4bf8987
1 changed files with 8 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
mkspecs/cmake/Qt5BasicConfig.cmake.in
View File

@ -14,14 +14,6 @@ set(Qt5$${CMAKE_MODULE_NAME}_COMPILE_DEFINITIONS QT_\${_CMAKE_MODULE_NAME_UPPER}
set(_Qt5_MODULE_DEPENDENCIES \"$${CMAKE_MODULE_DEPS}\") set(_Qt5_MODULE_DEPENDENCIES \"$${CMAKE_MODULE_DEPS}\")
if (NOT \"$${CMAKE_MODULE_EXTRAS}\" STREQUAL \"\")
include(\"${CMAKE_CURRENT_LIST_DIR}/Qt5$${CMAKE_MODULE_NAME}ConfigExtras.cmake\")
endif()
if (NOT \"$${CMAKE_MODULE_MACROS}\" STREQUAL \"\")
include(\"${CMAKE_CURRENT_LIST_DIR}/Qt5$${CMAKE_MODULE_NAME}Macros.cmake\")
endif()
if (NOT _Qt5$${CMAKE_MODULE_NAME}_target) if (NOT _Qt5$${CMAKE_MODULE_NAME}_target)
set(_Qt5$${CMAKE_MODULE_NAME}_target 1) set(_Qt5$${CMAKE_MODULE_NAME}_target 1)
add_library(Qt5::$${CMAKE_MODULE_NAME} SHARED IMPORTED) add_library(Qt5::$${CMAKE_MODULE_NAME} SHARED IMPORTED)
@ -55,3 +47,11 @@ if (NOT \"$${release_type}\" STREQUAL \"\")
) )
endif() endif()
endif() endif()
if (NOT \"$${CMAKE_MODULE_EXTRAS}\" STREQUAL \"\")
include(\"${CMAKE_CURRENT_LIST_DIR}/Qt5$${CMAKE_MODULE_NAME}ConfigExtras.cmake\")
endif()
if (NOT \"$${CMAKE_MODULE_MACROS}\" STREQUAL \"\")
include(\"${CMAKE_CURRENT_LIST_DIR}/Qt5$${CMAKE_MODULE_NAME}Macros.cmake\")
endif()