diff options
| author | Alexandru Croitor <alexandru.croitor@qt.io> | 2019-04-29 16:32:21 +0200 |
|---|---|---|
| committer | Alexandru Croitor <alexandru.croitor@qt.io> | 2019-04-29 15:26:54 +0000 |
| commit | f38ebcbe32621953663efbd479ecadf6de4e4cc9 (patch) | |
| tree | 95d909306e3bbf0b5a87e23619e95669d73d2b16 | |
| parent | a1752276e0f71f29df12317eaa81798ccbe2fa91 (diff) | |
Fix add_qt_tool to properly propagate NO_QT option
Otherwise add_qt_executable will still link against Core,
and thus building qmake in a static build will fail.
Amends a1752276e0f71f29df12317eaa81798ccbe2fa91
Change-Id: Iebbdf9d0a2808a9eaeffdf8fbdb44ff5e2920f3b
Reviewed-by: Tobias Hunger <tobias.hunger@qt.io>
| -rw-r--r-- | cmake/QtBuild.cmake | 10 |
1 files changed, 8 insertions, 2 deletions
diff --git a/cmake/QtBuild.cmake b/cmake/QtBuild.cmake index 6f178e2e58..aaa68d8c0a 100644 --- a/cmake/QtBuild.cmake +++ b/cmake/QtBuild.cmake @@ -808,7 +808,7 @@ endfunction() # Please consider to use a more specific version target like the one created # by add_qt_test or add_qt_tool below. function(add_qt_executable name) - qt_parse_all_arguments(arg "add_qt_executable" "GUI;BOOTSTRAP;NO_INSTALL" "OUTPUT_DIRECTORY;INSTALL_DIRECTORY" "EXE_FLAGS;${__default_private_args}" ${ARGN}) + qt_parse_all_arguments(arg "add_qt_executable" "GUI;BOOTSTRAP;NO_QT;NO_INSTALL" "OUTPUT_DIRECTORY;INSTALL_DIRECTORY" "EXE_FLAGS;${__default_private_args}" ${ARGN}) if ("x${arg_OUTPUT_DIRECTORY}" STREQUAL "x") set(arg_OUTPUT_DIRECTORY "${CMAKE_BINARY_DIR}/${INSTALL_BINDIR}") @@ -828,7 +828,7 @@ function(add_qt_executable name) ) set(extra_libraries "") - if(NOT arg_BOOTSTRAP) + if(NOT arg_BOOTSTRAP AND NOT arg_NO_QT) set(extra_libraries "Qt::Core") endif() @@ -947,6 +947,11 @@ function(add_qt_tool name) set(bootstrap BOOTSTRAP) endif() + set(no_qt "") + if(arg_NO_QT) + set(no_qt NO_QT) + endif() + set(no_install "") if(arg_NO_INSTALL) set(no_install NO_INSTALL) @@ -954,6 +959,7 @@ function(add_qt_tool name) add_qt_executable("${name}" OUTPUT_DIRECTORY "${CMAKE_BINARY_DIR}/${INSTALL_BINDIR}" ${bootstrap} + ${no_qt} ${no_install} SOURCES ${arg_SOURCES} INCLUDE_DIRECTORIES |