diff options
| author | Alexandru Croitor <alexandru.croitor@qt.io> | 2021-07-12 16:19:31 +0200 |
|---|---|---|
| committer | Qt Cherry-pick Bot <cherrypick_bot@qt-project.org> | 2021-07-16 20:13:30 +0000 |
| commit | f8a586ae191a1c4b89004babe31b1076dd82c4e1 (patch) | |
| tree | 5980432dcf82e8fd9bb4606c7b34a2c0d9af72f1 /cmake | |
| parent | 93cf4b8cb82f81d9682f939db0edf537f90d52ef (diff) | |
CMake: Clean up and simplify qt6_extract_metatypes implementation
Remove copying of json files in non-prefix builds.
Previously, this was done to mimic the directory layout of prefix
builds in a non-prefix build, but the extra complexity is not worth
it.
Keeping the files in the build directories of each repo in a
non-prefix build should be good enough.
As a result, we don't need to distinguish which file path should be
passed in INTERFACE_SOURCES. Now we have only 2 paths to consider, the
BUILD_INTERFACE one and the INSTALL_PREFIX one, rather than 3
different paths.
Move the code that handles installation closer together.
Rename the internal COPY_OVER_INSTALL option to
___QT_INTERNAL_NO_INSTALL.
We might want to expose it as a public option later, but it depends on
whether we will disable default installation for user projects.
Remove assignment of some properties that are not used anymore.
Amends c431e2d33c2b13dee8b43a08c267c20ec1ae9654
Task-number: QTBUG-94942
Change-Id: I3a26d1988987b2ce7c7d01d2311c13b3da3175a8
Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org>
Reviewed-by: Joerg Bornemann <joerg.bornemann@qt.io>
(cherry picked from commit fb9cbd3b2a12dfcddb8ef66d39ed4475ff1d56a7)
Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
Diffstat (limited to 'cmake')
| -rw-r--r-- | cmake/QtModuleHelpers.cmake | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/cmake/QtModuleHelpers.cmake b/cmake/QtModuleHelpers.cmake index 7409fee054..df440a2800 100644 --- a/cmake/QtModuleHelpers.cmake +++ b/cmake/QtModuleHelpers.cmake @@ -589,7 +589,7 @@ set(QT_LIBINFIX \"${QT_LIBINFIX}\")") set(metatypes_install_dir ${INSTALL_LIBDIR}/metatypes) set(args) if (NOT QT_WILL_INSTALL) - set(args COPY_OVER_INSTALL INSTALL_DIR "${QT_BUILD_DIR}/${metatypes_install_dir}") + set(args __QT_INTERNAL_NO_INSTALL) else() set(args INSTALL_DIR "${metatypes_install_dir}") endif() |