[prev in list] [next in list] [prev in thread] [next in thread] 

List:       kde-commits
Subject:    [extra-cmake-modules] modules: Simplify argument parsing for ecm_generate_headers
From:       Alex Merry <kde () randomguy3 ! me ! uk>
Date:       2014-02-18 17:23:03
Message-ID: E1WFoNr-0003cW-Ct () scm ! kde ! org
[Download RAW message or body]

Git commit 447fd4c50c5d9f6ff021c5274f0f8d04523fcf60 by Alex Merry.
Committed on 18/02/2014 at 15:37.
Pushed by alexmerry into branch 'master'.

Simplify argument parsing for ecm_generate_headers

Now that we no longer have to support the old syntax, some of the
more complex bits of the argument parsing can be removed.

REVIEW: 115869

M  +10   -21   modules/ECMGenerateHeaders.cmake

http://commits.kde.org/extra-cmake-modules/447fd4c50c5d9f6ff021c5274f0f8d04=
523fcf60

diff --git a/modules/ECMGenerateHeaders.cmake b/modules/ECMGenerateHeaders.=
cmake
index 23c9133..739c211 100644
--- a/modules/ECMGenerateHeaders.cmake
+++ b/modules/ECMGenerateHeaders.cmake
@@ -94,12 +94,20 @@
 =

 include(CMakeParseArguments)
 =

-function(ECM_GENERATE_HEADERS)
+function(ECM_GENERATE_HEADERS camelcase_headers_var)
     set(options)
-    set(oneValueArgs OUTPUT_DIR PREFIX REQUIRED_HEADERS RELATIVE MODULE_NA=
ME)
+    set(oneValueArgs OUTPUT_DIR PREFIX REQUIRED_HEADERS RELATIVE)
     set(multiValueArgs HEADER_NAMES)
     cmake_parse_arguments(EGH "${options}" "${oneValueArgs}" "${multiValue=
Args}" ${ARGN})
 =

+    if (EGH_UNPARSED_ARGUMENTS)
+        message(FATAL_ERROR "Unexpected arguments to ECM_GENERATE_HEADERS:=
 ${EGH_UNPARSED_ARGUMENTS}")
+    endif()
+
+    if(NOT EGH_HEADER_NAMES)
+       message(FATAL_ERROR "Missing header_names argument to ECM_GENERATE_=
HEADERS")
+    endif()
+
     if(NOT EGH_OUTPUT_DIR)
         set(EGH_OUTPUT_DIR "${CMAKE_CURRENT_BINARY_DIR}")
     endif()
@@ -116,25 +124,6 @@ function(ECM_GENERATE_HEADERS)
         string(TOLOWER "${EGH_PREFIX}" lowercaseprefix)
     endif()
 =

-    if(NOT EGH_HEADER_NAMES)
-       message(FATAL_ERROR "Missing header_names argument to ECM_GENERATE_=
HEADERS")
-    endif()
-
-    if (EGH_MODULE_NAME)
-        # this is not a valid argument in the new syntax
-        message(FATAL_ERROR "Unexpected MODULE_NAME argument for ECM_GENER=
ATE_HEADERS")
-    endif()
-
-    if (NOT EGH_UNPARSED_ARGUMENTS)
-        message(FATAL_ERROR "Missing camelcase_headers_var argument to ECM=
_GENERATE_HEADERS")
-    else()
-        list(GET EGH_UNPARSED_ARGUMENTS 0 camelcase_headers_var)
-        list(REMOVE_AT EGH_UNPARSED_ARGUMENTS 0)
-        if (EGH_UNPARSED_ARGUMENTS)
-            message(FATAL_ERROR "Unexpected arguments to ECM_GENERATE_HEAD=
ERS: ${EGH_UNPARSED_ARGUMENTS}")
-        endif()
-    endif()
-
     foreach(_CLASSNAME ${EGH_HEADER_NAMES})
         string(TOLOWER "${_CLASSNAME}" lowercaseclassname)
         set(FANCY_HEADER_FILE "${EGH_OUTPUT_DIR}/${EGH_PREFIX}${_CLASSNAME=
}")
[prev in list] [next in list] [prev in thread] [next in thread]