diff options
| author | Leander Beernaert <leander.beernaert@qt.io> | 2019-10-11 13:55:59 +0200 |
|---|---|---|
| committer | Leander Beernaert <leander.beernaert@qt.io> | 2019-10-11 12:18:20 +0000 |
| commit | ecccb71d3dd49199d02fc462d69770546d7d3bd3 (patch) | |
| tree | 3dbfb36d41b79cc07d235a05c247449b7aef77c8 | |
| parent | dbb29e8235941c646dc4b455db6e89fc6e0b590f (diff) | |
Fix handling of OUTPUT_DIRECTORY in add_cmake_library
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>
| -rw-r--r-- | cmake/QtBuild.cmake | 9 |
1 files changed, 7 insertions, 2 deletions
diff --git a/cmake/QtBuild.cmake b/cmake/QtBuild.cmake index 8c9e9bcd8f..e36e7b379d 100644 --- a/cmake/QtBuild.cmake +++ b/cmake/QtBuild.cmake @@ -2529,7 +2529,7 @@ function(add_cmake_library target) qt_parse_all_arguments(arg "add_cmake_library" "SHARED;MODULE;STATIC;INTERFACE" "OUTPUT_DIRECTORY;ARCHIVE_INSTALL_DIRECTORY;INSTALL_DIRECTORY" - "${__default_private_args};${__default_public_args};" + "${__default_private_args};${__default_public_args}" ${ARGN} ) @@ -2559,9 +2559,14 @@ function(add_cmake_library target) ) endif() + if (arg_OUTPUT_DIRECTORY) + set_target_properties(${target} PROPERTIES + OUTPUT_DIRECTORY ${arg_OUTPUT_DIRECTORY} + ) + endif() + extend_target("${target}" SOURCES ${arg_SOURCES} - OUTPUT_DIRECTORY ${arg_OUTPUT_DIRECTORY} INCLUDE_DIRECTORIES ${arg_INCLUDE_DIRECTORIES} PUBLIC_INCLUDE_DIRECTORIES |