diff options
| author | Simon Hausmann <simon.hausmann@qt.io> | 2019-07-29 15:07:27 +0200 |
|---|---|---|
| committer | Simon Hausmann <simon.hausmann@qt.io> | 2019-07-29 13:15:16 +0000 |
| commit | c75dcc6875af90635df252f529b5722b9d4a5bd0 (patch) | |
| tree | 066264369aaa8eefa9a9224ebc20e7f8eab54b76 /cmake | |
| parent | 6887ae2ff9f66bc30161d6234ca7afa93a5d4b22 (diff) | |
Permit the use of qml cache file generation even inside qtdeclarative
After re-arranging subdirs, the cmake target level dependencies can
handle building qmlcachegen before running the custom command for
generating cache files.
Change-Id: I8a35b2b5bfd2fdf4b49462ff9c27e5f3075254fc
Reviewed-by: Alexandru Croitor <alexandru.croitor@qt.io>
Diffstat (limited to 'cmake')
| -rw-r--r-- | cmake/QtBuild.cmake | 7 |
1 files changed, 0 insertions, 7 deletions
diff --git a/cmake/QtBuild.cmake b/cmake/QtBuild.cmake index d9afbfc065..e00da0f17c 100644 --- a/cmake/QtBuild.cmake +++ b/cmake/QtBuild.cmake @@ -1775,13 +1775,6 @@ function(add_qmlcachegen_target target) return() endif() - if ("${CMAKE_PROJECT_NAME}" STREQUAL "QtDeclarative" - AND NOT TARGET ${QT_CMAKE_EXPORT_NAMESPACE}::qmlcachegen) - # qmlcachegen is not available when building qtdeclarative since - # tools get built after source. We should not error in this case. - return() - endif() - if (NOT TARGET ${QT_CMAKE_EXPORT_NAMESPACE}::qmlcachegen) message(FATAL_ERROR "Could not locate qmlcachegen tool. \ Please add QmlTools to your find_package command." |