Changeset 2624 for code/branches/buildsystem2/cmake/FlagUtilities.cmake

Timestamp:

Jan 30, 2009, 12:48:20 PM (15 years ago)

Author:

rgrieder

Message:

Replaced most of the ELSE(…) and ENDIF(…) with ELSE() and ENDIF(). Kept the shorter and the spreaded ones for better clarity since that's what it originally was thought for. But I can really pollute the code when having long conditions and lots of IFs.

File:

• code/branches/buildsystem2/cmake/FlagUtilities.cmake (modified) (7 diffs)

code/branches/buildsystem2/cmake/FlagUtilities.cmake

@@ -23 +23 @@
   IF(NOT "${_type}" MATCHES "^(STRING|BOOL|PATH|FILEPATH)$")
     MESSAGE(FATAL_ERROR "${_type} is not a valid CACHE entry type")
-  ENDIF(NOT "${_type}" MATCHES "^(STRING|BOOL|PATH|FILEPATH)$")
+  ENDIF()
 
   IF(NOT DEFINED _INTERNAL_${_varname} OR "${_INTERNAL_${_varname}}" STREQUAL "${${_varname}}")
     SET(${_varname} "${_value}" CACHE ${_type} "${_docstring}" FORCE)
-  ENDIF(NOT DEFINED _INTERNAL_${_varname} OR "${_INTERNAL_${_varname}}" STREQUAL "${${_varname}}")
+  ENDIF()
   SET(_INTERNAL_${_varname} "${_value}" CACHE INTERNAL "Do not edit in any case!")
 ENDMACRO(SET_CACHE)
@@ -69 +69 @@
     # SET
     SET(_flag_list "${_arg_flag_list}")
-  ELSE("${_mode}" STREQUAL "SET")
+  ELSE()
     # ADD or REMOVE
     SEPARATE_FLAGS("${${_varname}}" _flag_list)
@@ -75 +75 @@
       LIST(${_mode} _flag_list "${_flag}")
     ENDFOREACH(_flag)
-  ENDIF("${_mode}" STREQUAL "SET")
+  ENDIF()
 
   LIST(REMOVE_DUPLICATES _flag_list)
@@ -85 +85 @@
       SET(${_varname} "${_flag_list}" CACHE STRING "${${_varname}}" FORCE)
       SET(${_varname} "${_flag_list}" CACHE STRING "${${_varname}}" FORCE)
-    ELSE(_force)
+    ELSE()
       SET_CACHE(${_varname} STRING "${${_varname}}" "${_flag_list}")
-    ENDIF(_force)
-  ELSE(_write_to_cache)
+    ENDIF()
+  ELSE()
     SET(${_varname} "${_flag_list}")
-  ENDIF(_write_to_cache)
+  ENDIF()
 ENDMACRO(_INTERNAL_PARSE_FLAGS)
 
@@ -121 +121 @@
     ELSEIF(_arg MATCHES "^[Nn][Oo][Tt]$")
       SET(_invert_condition TRUE)
-    ELSE(_arg MATCHES "${_key_regex}")
+    ELSE()
       IF(_invert_condition)
         SET(_invert_condition FALSE)
         IF(${_arg})
           SET(_arg_cond FALSE)
-        ELSE(${_arg})
+        ELSE()
           SET(_arg_cond TRUE)
-        ENDIF(${_arg})
-      ELSE(_invert_condition)
+        ENDIF()
+      ELSE()
         SET(_arg_cond ${${_arg}})
-      ENDIF(_invert_condition)
+      ENDIF()
       IF(_cond AND _arg_cond)
         SET(_cond TRUE)
-      ELSE(_cond AND _arg_cond)
+      ELSE()
         SET(_cond FALSE)
-      ENDIF(_cond AND _arg_cond)
-    ENDIF(_arg MATCHES "${_key_regex}")
+      ENDIF()
+    ENDIF()
   ENDFOREACH(_arg)
 
@@ -143 +143 @@
   IF(NOT DEFINED _langs)
     SET(_langs ${_keys})
-  ENDIF(NOT DEFINED _langs)
+  ENDIF()
 
   IF(_cond)
@@ -152 +152 @@
           _INTERNAL_PARSE_FLAGS(${_mode} "${_flags}" ${_varname}_${_build_type} ${_write_to_cache} ${_force})
         ENDFOREACH(_build_type)
-      ELSE(DEFINED _build_types)
+      ELSE()
         _INTERNAL_PARSE_FLAGS(${_mode} "${_flags}" ${_varname} ${_write_to_cache} ${_force})
-      ENDIF(DEFINED _build_types)
+      ENDIF()
     ENDFOREACH(_lang ${_langs})
   ENDIF(_cond)