diff options
| author | Alexandru Croitor <alexandru.croitor@qt.io> | 2021-07-12 16:19:31 +0200 |
|---|---|---|
| committer | Alexandru Croitor <alexandru.croitor@qt.io> | 2021-07-16 18:19:19 +0200 |
| commit | fb9cbd3b2a12dfcddb8ef66d39ed4475ff1d56a7 (patch) | |
| tree | 623e05e52a3a557f04719b9024c61c7ce565a3ea /src/corelib/CMakeLists.txt | |
| parent | bcca14a1933de9f188950a9a2d3a450a0772d479 (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
Pick-to: 6.2
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>
Diffstat (limited to 'src/corelib/CMakeLists.txt')
| -rw-r--r-- | src/corelib/CMakeLists.txt | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/src/corelib/CMakeLists.txt b/src/corelib/CMakeLists.txt index 4878c45008..2df53a0a00 100644 --- a/src/corelib/CMakeLists.txt +++ b/src/corelib/CMakeLists.txt @@ -317,8 +317,7 @@ set(core_metatype_args MANUAL_MOC_JSON_FILES ${core_qobject_metatypes_json_list} set(metatypes_install_dir ${INSTALL_LIBDIR}/metatypes) if (NOT QT_WILL_INSTALL) - list(APPEND core_metatype_args - COPY_OVER_INSTALL INSTALL_DIR "${QT_BUILD_DIR}/${metatypes_install_dir}") + list(APPEND core_metatype_args __QT_INTERNAL_NO_INSTALL) else() list(APPEND core_metatype_args INSTALL_DIR "${metatypes_install_dir}") endif() |