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

CMake: Potentially use INSTALL_LIBDIR in qt6_extract_metatypes

Browse Source 
The INSTALL_LIBDIR value is only set when doing a Qt build. Use it
when available, otherwise default to a more 'hardcoded' value.

Change-Id: I96b7b8094c699de59ffaff00cd677d8322c474c3
Reviewed-by: Christophe Giboudeaux <christophe@krop.fr>
Reviewed-by: Joerg Bornemann <joerg.bornemann@qt.io>
This commit is contained in:
Alexandru Croitor 2020-11-10 15:31:11 +01:00
parent 43aaf74f60
commit 6391c31dec
1 changed files with 7 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
src/corelib/Qt6CoreMacros.cmake
View File

@ -580,7 +580,7 @@ endif()
# the --output-json parameter. # the --output-json parameter.
# Params: # Params:
# INSTALL_DIR: Location where to install the metatypes file. For public consumption, # INSTALL_DIR: Location where to install the metatypes file. For public consumption,
# defaults to a ${CMAKE_INSTALL_PREFIX}/lib/metatypes directory. # defaults to a ${CMAKE_INSTALL_PREFIX}/${INSTALL_LIBDIR}/metatypes directory.
# Executable metatypes files are never installed. # Executable metatypes files are never installed.
# COPY_OVER_INSTALL: (Qt Internal) When present will install the file via a post build step # COPY_OVER_INSTALL: (Qt Internal) When present will install the file via a post build step
# copy rather than using install. # copy rather than using install.
@ -614,7 +614,12 @@ function(qt6_extract_metatypes target)
# Automatically fill default install args when not specified. # Automatically fill default install args when not specified.
if (NOT arg_INSTALL_DIR) if (NOT arg_INSTALL_DIR)
set(arg_INSTALL_DIR "lib/metatypes") # INSTALL_LIBDIR is not set when QtBuildInternals is not loaded (when not doing a Qt build).
if(INSTALL_LIBDIR)
set(arg_INSTALL_DIR "${INSTALL_LIBDIR}/metatypes")
else()
set(arg_INSTALL_DIR "lib/metatypes")
endif()
endif() endif()
get_target_property(target_binary_dir ${target} BINARY_DIR) get_target_property(target_binary_dir ${target} BINARY_DIR)