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

Fix handling of OUTPUT_DIRECTORY in add_cmake_library

Browse Source 
extend_target() does not handle the OUTPUT_DIRECTORY argument, so we
must handle it ourselves.

Change-Id: I31880a516ae185f3255b2a51f41d61ee6b1d9838
Reviewed-by: Alexandru Croitor <alexandru.croitor@qt.io>
This commit is contained in:
Leander Beernaert 2019-10-11 13:55:59 +02:00
parent dbb29e8235
commit ecccb71d3d
1 changed files with 7 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
cmake/QtBuild.cmake
View File

@ -2529,7 +2529,7 @@ function(add_cmake_library target)
qt_parse_all_arguments(arg "add_cmake_library" qt_parse_all_arguments(arg "add_cmake_library"
"SHARED;MODULE;STATIC;INTERFACE" "SHARED;MODULE;STATIC;INTERFACE"
"OUTPUT_DIRECTORY;ARCHIVE_INSTALL_DIRECTORY;INSTALL_DIRECTORY" "OUTPUT_DIRECTORY;ARCHIVE_INSTALL_DIRECTORY;INSTALL_DIRECTORY"
"${__default_private_args};${__default_public_args};" "${__default_private_args};${__default_public_args}"
${ARGN} ${ARGN}
) )
@ -2559,9 +2559,14 @@ function(add_cmake_library target)
) )
endif() endif()
if (arg_OUTPUT_DIRECTORY)
set_target_properties(${target} PROPERTIES
OUTPUT_DIRECTORY ${arg_OUTPUT_DIRECTORY}
)
endif()
extend_target("${target}" extend_target("${target}"
SOURCES ${arg_SOURCES} SOURCES ${arg_SOURCES}
OUTPUT_DIRECTORY ${arg_OUTPUT_DIRECTORY}
INCLUDE_DIRECTORIES INCLUDE_DIRECTORIES
${arg_INCLUDE_DIRECTORIES} ${arg_INCLUDE_DIRECTORIES}
PUBLIC_INCLUDE_DIRECTORIES PUBLIC_INCLUDE_DIRECTORIES