From e8f27a71bb96b0126539bc8ed29edb37254fa5ff Mon Sep 17 00:00:00 2001
From: Stephen Kelly <stephen.kelly@kdab.com>
Date: Mon, 5 Dec 2011 02:06:21 +0100
Subject: Port to CMakeParseArguments from a custom rolled macro.

Change-Id: Ia7bf5046420ee8f2d690d098937a212eb75b07ce
Reviewed-by: Clinton Stimpson <clinton@elemtech.com>
Reviewed-by: Stephen Kelly <stephen.kelly@kdab.com>
---
 src/corelib/Qt5CoreMacros.cmake | 37 ++++++++++++++++++-------------------
 1 file changed, 18 insertions(+), 19 deletions(-)

(limited to 'src/corelib/Qt5CoreMacros.cmake')

diff --git a/src/corelib/Qt5CoreMacros.cmake b/src/corelib/Qt5CoreMacros.cmake
index 1da0822960..96f878f2b1 100644
--- a/src/corelib/Qt5CoreMacros.cmake
+++ b/src/corelib/Qt5CoreMacros.cmake
@@ -36,23 +36,7 @@
 #
 ######################################
 
-MACRO (QT5_EXTRACT_OPTIONS _qt5_files _qt5_options)
-  SET(${_qt5_files})
-  SET(${_qt5_options})
-  SET(_QT5_DOING_OPTIONS FALSE)
-  FOREACH(_currentArg ${ARGN})
-    IF ("${_currentArg}" STREQUAL "OPTIONS")
-      SET(_QT5_DOING_OPTIONS TRUE)
-    ELSE ("${_currentArg}" STREQUAL "OPTIONS")
-      IF(_QT5_DOING_OPTIONS)
-        LIST(APPEND ${_qt5_options} "${_currentArg}")
-      ELSE(_QT5_DOING_OPTIONS)
-        LIST(APPEND ${_qt5_files} "${_currentArg}")
-      ENDIF(_QT5_DOING_OPTIONS)
-    ENDIF ("${_currentArg}" STREQUAL "OPTIONS")
-  ENDFOREACH(_currentArg)
-ENDMACRO (QT5_EXTRACT_OPTIONS)
-
+include(CMakeParseArguments)
 
 # macro used to create the names of output files preserving relative dirs
 MACRO (QT5_MAKE_OUTPUT_FILE infile prefix ext outfile )
@@ -156,8 +140,15 @@ ENDMACRO (QT5_GENERATE_MOC)
 MACRO (QT5_WRAP_CPP outfiles )
   # get include dirs
   QT5_GET_MOC_FLAGS(moc_flags)
-  QT5_EXTRACT_OPTIONS(moc_files moc_options ${ARGN})
 
+  set(options)
+  set(oneValueArgs)
+  set(multiValueArgs OPTIONS)
+
+  cmake_parse_arguments(_WRAP_CPP "${options}" "${oneValueArgs}" "${multiValueArgs}" ${ARGN})
+
+  set(moc_files ${_WRAP_CPP_UNPARSED_ARGUMENTS})
+  set(moc_options ${_WRAP_CPP_OPTIONS})
   FOREACH (it ${moc_files})
     GET_FILENAME_COMPONENT(it ${it} ABSOLUTE)
     QT5_MAKE_OUTPUT_FILE(${it} moc_ cxx outfile)
@@ -171,7 +162,15 @@ ENDMACRO (QT5_WRAP_CPP)
 # QT5_ADD_RESOURCES(outfiles inputfile ... )
 
 MACRO (QT5_ADD_RESOURCES outfiles )
-  QT5_EXTRACT_OPTIONS(rcc_files rcc_options ${ARGN})
+
+  set(options)
+  set(oneValueArgs)
+  set(multiValueArgs OPTIONS)
+
+  cmake_parse_arguments(_RCC "${options}" "${oneValueArgs}" "${multiValueArgs}" ${ARGN})
+
+  set(rcc_files ${_RCC_UNPARSED_ARGUMENTS})
+  set(rcc_options ${_RCC_OPTIONS})
 
   FOREACH (it ${rcc_files})
     GET_FILENAME_COMPONENT(outfilename ${it} NAME_WE)
-- 
cgit v1.2.3