diff options
| -rw-r--r-- | cmake/QtBuild.cmake | 10 | ||||
| -rw-r--r-- | cmake/QtExecutableHelpers.cmake | 8 | ||||
| -rw-r--r-- | cmake/QtTestHelpers.cmake | 48 | ||||
| -rw-r--r-- | cmake/QtToolHelpers.cmake | 2 |
4 files changed, 34 insertions, 34 deletions
diff --git a/cmake/QtBuild.cmake b/cmake/QtBuild.cmake index a15a7353df..6579aae37a 100644 --- a/cmake/QtBuild.cmake +++ b/cmake/QtBuild.cmake @@ -434,16 +434,16 @@ set(__qt_add_plugin_multi_args "${__default_private_args};${__default_public_args};DEFAULT_IF" ) -# Collection of qt_add_executable arguments so they can be shared across qt_add_executable -# and qt_add_test_helper. -set(__qt_add_executable_optional_args +# Collection of arguments so they can be shared across qt_internal_add_executable +# and qt_internal_add_test_helper. +set(__qt_internal_add_executable_optional_args "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" ${__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}" ) diff --git a/cmake/QtExecutableHelpers.cmake b/cmake/QtExecutableHelpers.cmake index b34b0b371b..ad2ce9f30c 100644 --- a/cmake/QtExecutableHelpers.cmake +++ b/cmake/QtExecutableHelpers.cmake @@ -2,10 +2,10 @@ # Please consider to use a more specific version target like the one created # by qt_add_test or qt_add_tool below. function(qt_internal_add_executable name) - qt_parse_all_arguments(arg "qt_add_executable" - "${__qt_add_executable_optional_args}" - "${__qt_add_executable_single_args}" - "${__qt_add_executable_multi_args}" + qt_parse_all_arguments(arg "qt_internal_add_executable" + "${__qt_internal_add_executable_optional_args}" + "${__qt_internal_add_executable_single_args}" + "${__qt_internal_add_executable_multi_args}" ${ARGN}) if ("x${arg_OUTPUT_DIRECTORY}" STREQUAL "x") diff --git a/cmake/QtTestHelpers.cmake b/cmake/QtTestHelpers.cmake index 947436b97d..6964ad582c 100644 --- a/cmake/QtTestHelpers.cmake +++ b/cmake/QtTestHelpers.cmake @@ -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. -# See qt_add_executable() for more details. +# See qt_internal_add_executable() for more details. function(qt_internal_add_benchmark target) qt_parse_all_arguments(arg "qt_add_benchmark" - "${__qt_add_executable_optional_args}" - "${__qt_add_executable_single_args}" - "${__qt_add_executable_multi_args}" + "${__qt_internal_add_executable_optional_args}" + "${__qt_internal_add_executable_single_args}" + "${__qt_internal_add_executable_multi_args}" ${ARGN} ) @@ -16,9 +16,9 @@ function(qt_internal_add_benchmark target) OUTPUT_DIRECTORY INSTALL_DIRECTORY ALL_ARGS - "${__qt_add_executable_optional_args}" - "${__qt_add_executable_single_args}" - "${__qt_add_executable_multi_args}" + "${__qt_internal_add_executable_optional_args}" + "${__qt_internal_add_executable_single_args}" + "${__qt_internal_add_executable_multi_args}" ARGS ${ARGV} ) @@ -27,7 +27,7 @@ function(qt_internal_add_benchmark target) set(arg_OUTPUT_DIRECTORY "${CMAKE_CURRENT_BINARY_DIR}") endif() - qt_add_executable(${target} + qt_internal_add_executable(${target} NO_INSTALL # we don't install benchmarks OUTPUT_DIRECTORY "${arg_OUTPUT_DIRECTORY}" # avoid polluting bin directory ${exec_args} @@ -35,15 +35,15 @@ function(qt_internal_add_benchmark target) 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. -# See qt_add_executable() for more details. +# See qt_internal_add_executable() for more details. function(qt_internal_add_manual_test target) qt_parse_all_arguments(arg "qt_add_manual_test" - "${__qt_add_executable_optional_args}" - "${__qt_add_executable_single_args}" - "${__qt_add_executable_multi_args}" + "${__qt_internal_add_executable_optional_args}" + "${__qt_internal_add_executable_single_args}" + "${__qt_internal_add_executable_multi_args}" ${ARGN} ) @@ -53,9 +53,9 @@ function(qt_internal_add_manual_test target) OUTPUT_DIRECTORY INSTALL_DIRECTORY ALL_ARGS - "${__qt_add_executable_optional_args}" - "${__qt_add_executable_single_args}" - "${__qt_add_executable_multi_args}" + "${__qt_internal_add_executable_optional_args}" + "${__qt_internal_add_executable_single_args}" + "${__qt_internal_add_executable_multi_args}" ARGS ${ARGV} ) @@ -64,7 +64,7 @@ function(qt_internal_add_manual_test target) set(arg_OUTPUT_DIRECTORY "${CMAKE_CURRENT_BINARY_DIR}") endif() - qt_add_executable(${target} + qt_internal_add_executable(${target} NO_INSTALL # we don't install benchmarks OUTPUT_DIRECTORY "${arg_OUTPUT_DIRECTORY}" # avoid polluting bin directory ${exec_args} @@ -384,9 +384,9 @@ function(qt_internal_add_test_helper name) ) qt_parse_all_arguments(arg "qt_add_test_helper" - "${qt_add_test_helper_optional_args};${__qt_add_executable_optional_args}" - "${__qt_add_executable_single_args}" - "${__qt_add_executable_multi_args}" + "${qt_add_test_helper_optional_args};${__qt_internal_add_executable_optional_args}" + "${__qt_internal_add_executable_single_args}" + "${__qt_internal_add_executable_multi_args}" ${ARGN}) qt_remove_args(forward_args @@ -395,9 +395,9 @@ function(qt_internal_add_test_helper name) ${qt_add_test_helper_optional_args} ALL_ARGS ${qt_add_test_helper_optional_args} - ${__qt_add_executable_optional_args} - ${__qt_add_executable_single_args} - ${__qt_add_executable_multi_args} + ${__qt_internal_add_executable_optional_args} + ${__qt_internal_add_executable_single_args} + ${__qt_internal_add_executable_multi_args} ARGS ${ARGV} ) diff --git a/cmake/QtToolHelpers.cmake b/cmake/QtToolHelpers.cmake index 5a812a3a45..c6914e2d23 100644 --- a/cmake/QtToolHelpers.cmake +++ b/cmake/QtToolHelpers.cmake @@ -373,7 +373,7 @@ endfunction() # 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 # 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) if(QT_NO_MAKE_TOOLS) set(absolute_path_directories "") |