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

CMake: Fix leftover usage of qt_add_executable

Browse Source 
All usages should be replaced with qt_internal_add_executable instead.
This should fix configuration failure of benchmarks and manual tests.

Amends e0c62a48b8a826a46a143e57e94b2a0ea73c7cae

Task-number: QTBUG-86815
Change-Id: I0791d849998ed9517e32f699d843367949b97cb9
Reviewed-by: Joerg Bornemann <joerg.bornemann@qt.io>
This commit is contained in:
Alexandru Croitor 2020-10-07 16:29:38 +02:00
parent a11c776c44
commit b7f1915bd2
4 changed files with 34 additions and 34 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
cmake/QtBuild.cmake
View File

@ -434,16 +434,16 @@ set(__qt_add_plugin_multi_args
"${__default_private_args};${__default_public_args};DEFAULT_IF" "${__default_private_args};${__default_public_args};DEFAULT_IF"
) )
# Collection of qt_add_executable arguments so they can be shared across qt_add_executable # Collection of arguments so they can be shared across qt_internal_add_executable
# and qt_add_test_helper. # and qt_internal_add_test_helper.
set(__qt_add_executable_optional_args set(__qt_internal_add_executable_optional_args
"GUI;BOOTSTRAP;NO_QT;NO_INSTALL;EXCEPTIONS;DELAY_RC;DELAY_TARGET_INFO" "GUI;BOOTSTRAP;NO_QT;NO_INSTALL;EXCEPTIONS;DELAY_RC;DELAY_TARGET_INFO"
) )
set(__qt_add_executable_single_args set(__qt_internal_add_executable_single_args
"OUTPUT_DIRECTORY;INSTALL_DIRECTORY;VERSION" "OUTPUT_DIRECTORY;INSTALL_DIRECTORY;VERSION"
${__default_target_info_args} ${__default_target_info_args}
) )
set(__qt_add_executable_multi_args set(__qt_internal_add_executable_multi_args
"EXE_FLAGS;${__default_private_args};${__default_public_args}" "EXE_FLAGS;${__default_private_args};${__default_public_args}"
) )

8
cmake/QtExecutableHelpers.cmake
View File

@ -2,10 +2,10 @@
# Please consider to use a more specific version target like the one created # Please consider to use a more specific version target like the one created
# by qt_add_test or qt_add_tool below. # by qt_add_test or qt_add_tool below.
function(qt_internal_add_executable name) function(qt_internal_add_executable name)
qt_parse_all_arguments(arg "qt_add_executable" qt_parse_all_arguments(arg "qt_internal_add_executable"
"${__qt_add_executable_optional_args}" "${__qt_internal_add_executable_optional_args}"
"${__qt_add_executable_single_args}" "${__qt_internal_add_executable_single_args}"
"${__qt_add_executable_multi_args}" "${__qt_internal_add_executable_multi_args}"
${ARGN}) ${ARGN})
if ("x${arg_OUTPUT_DIRECTORY}" STREQUAL "x") if ("x${arg_OUTPUT_DIRECTORY}" STREQUAL "x")

48
cmake/QtTestHelpers.cmake
View File

@ -1,12 +1,12 @@
# Simple wrapper around qt_add_executable for benchmarks which insure that # Simple wrapper around qt_internal_add_executable for benchmarks which insure that
# the binary is built under ${CMAKE_CURRENT_BINARY_DIR} and never installed. # the binary is built under ${CMAKE_CURRENT_BINARY_DIR} and never installed.
# See qt_add_executable() for more details. # See qt_internal_add_executable() for more details.
function(qt_internal_add_benchmark target) function(qt_internal_add_benchmark target)
qt_parse_all_arguments(arg "qt_add_benchmark" qt_parse_all_arguments(arg "qt_add_benchmark"
"${__qt_add_executable_optional_args}" "${__qt_internal_add_executable_optional_args}"
"${__qt_add_executable_single_args}" "${__qt_internal_add_executable_single_args}"
"${__qt_add_executable_multi_args}" "${__qt_internal_add_executable_multi_args}"
${ARGN} ${ARGN}
) )
@ -16,9 +16,9 @@ function(qt_internal_add_benchmark target)
OUTPUT_DIRECTORY OUTPUT_DIRECTORY
INSTALL_DIRECTORY INSTALL_DIRECTORY
ALL_ARGS ALL_ARGS
"${__qt_add_executable_optional_args}" "${__qt_internal_add_executable_optional_args}"
"${__qt_add_executable_single_args}" "${__qt_internal_add_executable_single_args}"
"${__qt_add_executable_multi_args}" "${__qt_internal_add_executable_multi_args}"
ARGS ARGS
${ARGV} ${ARGV}
) )
@ -27,7 +27,7 @@ function(qt_internal_add_benchmark target)
set(arg_OUTPUT_DIRECTORY "${CMAKE_CURRENT_BINARY_DIR}") set(arg_OUTPUT_DIRECTORY "${CMAKE_CURRENT_BINARY_DIR}")
endif() endif()
qt_add_executable(${target} qt_internal_add_executable(${target}
NO_INSTALL # we don't install benchmarks NO_INSTALL # we don't install benchmarks
OUTPUT_DIRECTORY "${arg_OUTPUT_DIRECTORY}" # avoid polluting bin directory OUTPUT_DIRECTORY "${arg_OUTPUT_DIRECTORY}" # avoid polluting bin directory
${exec_args} ${exec_args}
@ -35,15 +35,15 @@ function(qt_internal_add_benchmark target)
endfunction() endfunction()
# Simple wrapper around qt_add_executable for manual tests which insure that # Simple wrapper around qt_internal_add_executable for manual tests which insure that
# the binary is built under ${CMAKE_CURRENT_BINARY_DIR} and never installed. # the binary is built under ${CMAKE_CURRENT_BINARY_DIR} and never installed.
# See qt_add_executable() for more details. # See qt_internal_add_executable() for more details.
function(qt_internal_add_manual_test target) function(qt_internal_add_manual_test target)
qt_parse_all_arguments(arg "qt_add_manual_test" qt_parse_all_arguments(arg "qt_add_manual_test"
"${__qt_add_executable_optional_args}" "${__qt_internal_add_executable_optional_args}"
"${__qt_add_executable_single_args}" "${__qt_internal_add_executable_single_args}"
"${__qt_add_executable_multi_args}" "${__qt_internal_add_executable_multi_args}"
${ARGN} ${ARGN}
) )
@ -53,9 +53,9 @@ function(qt_internal_add_manual_test target)
OUTPUT_DIRECTORY OUTPUT_DIRECTORY
INSTALL_DIRECTORY INSTALL_DIRECTORY
ALL_ARGS ALL_ARGS
"${__qt_add_executable_optional_args}" "${__qt_internal_add_executable_optional_args}"
"${__qt_add_executable_single_args}" "${__qt_internal_add_executable_single_args}"
"${__qt_add_executable_multi_args}" "${__qt_internal_add_executable_multi_args}"
ARGS ARGS
${ARGV} ${ARGV}
) )
@ -64,7 +64,7 @@ function(qt_internal_add_manual_test target)
set(arg_OUTPUT_DIRECTORY "${CMAKE_CURRENT_BINARY_DIR}") set(arg_OUTPUT_DIRECTORY "${CMAKE_CURRENT_BINARY_DIR}")
endif() endif()
qt_add_executable(${target} qt_internal_add_executable(${target}
NO_INSTALL # we don't install benchmarks NO_INSTALL # we don't install benchmarks
OUTPUT_DIRECTORY "${arg_OUTPUT_DIRECTORY}" # avoid polluting bin directory OUTPUT_DIRECTORY "${arg_OUTPUT_DIRECTORY}" # avoid polluting bin directory
${exec_args} ${exec_args}
@ -384,9 +384,9 @@ function(qt_internal_add_test_helper name)
) )
qt_parse_all_arguments(arg "qt_add_test_helper" qt_parse_all_arguments(arg "qt_add_test_helper"
"${qt_add_test_helper_optional_args};${__qt_add_executable_optional_args}" "${qt_add_test_helper_optional_args};${__qt_internal_add_executable_optional_args}"
"${__qt_add_executable_single_args}" "${__qt_internal_add_executable_single_args}"
"${__qt_add_executable_multi_args}" "${__qt_internal_add_executable_multi_args}"
${ARGN}) ${ARGN})
qt_remove_args(forward_args qt_remove_args(forward_args
@ -395,9 +395,9 @@ function(qt_internal_add_test_helper name)
${qt_add_test_helper_optional_args} ${qt_add_test_helper_optional_args}
ALL_ARGS ALL_ARGS
${qt_add_test_helper_optional_args} ${qt_add_test_helper_optional_args}
${__qt_add_executable_optional_args} ${__qt_internal_add_executable_optional_args}
${__qt_add_executable_single_args} ${__qt_internal_add_executable_single_args}
${__qt_add_executable_multi_args} ${__qt_internal_add_executable_multi_args}
ARGS ARGS
${ARGV} ${ARGV}
) )

2
cmake/QtToolHelpers.cmake
View File

@ -373,7 +373,7 @@ endfunction()
# Equivalent of qmake's qtNomakeTools(directory1 directory2). # Equivalent of qmake's qtNomakeTools(directory1 directory2).
# If QT_NO_MAKE_TOOLS is true, then targets within the given directories will be excluded from the # If QT_NO_MAKE_TOOLS is true, then targets within the given directories will be excluded from the
# default 'all' target, as well as from install phase. # default 'all' target, as well as from install phase.
# The private variable is checked by qt_add_executable. # The private variable is checked by qt_internal_add_executable.
function(qt_exclude_tool_directories_from_default_target) function(qt_exclude_tool_directories_from_default_target)
if(QT_NO_MAKE_TOOLS) if(QT_NO_MAKE_TOOLS)
set(absolute_path_directories "") set(absolute_path_directories "")