From 10d5c0adafb7989c44794caef14a192cce9673a7 Mon Sep 17 00:00:00 2001 From: Amir Masoud Abdol Date: Thu, 13 Oct 2022 16:34:25 +0200 Subject: [PATCH] Remove the Unnecessary CMake Module, `include(CMakeParseArguments)` From CMake 3.7 both flavors of `cmake_parse_arguments` are natively available in CMake, and loading the `CMakeParseArguments` module is not needed anymore. Fixes: QTBUG-107574 Pick-to: 6.4 Change-Id: I7c8a6c5871cdb2f92a4aa43932b6f2ee99e1f57f Reviewed-by: Alexandru Croitor Reviewed-by: Alexey Edelev --- .../extra-cmake-modules/find-modules/FindWaylandScanner.cmake | 3 --- .../extra-cmake-modules/modules/ECMFindModuleHelpers.cmake | 2 -- src/corelib/Qt6CoreMacros.cmake | 2 -- src/dbus/Qt6DBusMacros.cmake | 2 -- src/widgets/Qt6WidgetsMacros.cmake | 2 -- 5 files changed, 11 deletions(-) diff --git a/cmake/3rdparty/extra-cmake-modules/find-modules/FindWaylandScanner.cmake b/cmake/3rdparty/extra-cmake-modules/find-modules/FindWaylandScanner.cmake index 13291afcda2..60adaf41845 100644 --- a/cmake/3rdparty/extra-cmake-modules/find-modules/FindWaylandScanner.cmake +++ b/cmake/3rdparty/extra-cmake-modules/find-modules/FindWaylandScanner.cmake @@ -107,9 +107,6 @@ set_package_properties(WaylandScanner PROPERTIES DESCRIPTION "Executable that converts XML protocol files to C code" ) - -include(CMakeParseArguments) - function(ecm_add_wayland_client_protocol out_var) # Parse arguments set(oneValueArgs PROTOCOL BASENAME) diff --git a/cmake/3rdparty/extra-cmake-modules/modules/ECMFindModuleHelpers.cmake b/cmake/3rdparty/extra-cmake-modules/modules/ECMFindModuleHelpers.cmake index 841453998ae..a5dabb1074b 100644 --- a/cmake/3rdparty/extra-cmake-modules/modules/ECMFindModuleHelpers.cmake +++ b/cmake/3rdparty/extra-cmake-modules/modules/ECMFindModuleHelpers.cmake @@ -123,8 +123,6 @@ # (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF # THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. -include(CMakeParseArguments) - macro(ecm_find_package_version_check module_name) if(CMAKE_VERSION VERSION_LESS 2.8.12) message(FATAL_ERROR "CMake 2.8.12 is required by Find${module_name}.cmake") diff --git a/src/corelib/Qt6CoreMacros.cmake b/src/corelib/Qt6CoreMacros.cmake index a24fd8dd29f..e192092871d 100644 --- a/src/corelib/Qt6CoreMacros.cmake +++ b/src/corelib/Qt6CoreMacros.cmake @@ -8,8 +8,6 @@ # ###################################### -include(CMakeParseArguments) - set(__qt_core_macros_module_base_dir "${CMAKE_CURRENT_LIST_DIR}") # macro used to create the names of output files preserving relative dirs diff --git a/src/dbus/Qt6DBusMacros.cmake b/src/dbus/Qt6DBusMacros.cmake index c2c4a6dc6ff..57a4a0735e3 100644 --- a/src/dbus/Qt6DBusMacros.cmake +++ b/src/dbus/Qt6DBusMacros.cmake @@ -4,8 +4,6 @@ include(MacroAddFileDependencies) -include(CMakeParseArguments) - function(qt6_add_dbus_interface _sources _interface _relativename) get_filename_component(_infile ${_interface} ABSOLUTE) get_filename_component(_basepath ${_relativename} DIRECTORY) diff --git a/src/widgets/Qt6WidgetsMacros.cmake b/src/widgets/Qt6WidgetsMacros.cmake index 45dcf4e57cb..b15d1fe81d1 100644 --- a/src/widgets/Qt6WidgetsMacros.cmake +++ b/src/widgets/Qt6WidgetsMacros.cmake @@ -8,8 +8,6 @@ # ###################################### -include(CMakeParseArguments) - # qt6_wrap_ui(outfiles inputfile ... )