Changeset 2624 for code/branches/buildsystem2/cmake/CheckOGREPlugins.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/CheckOGREPlugins.cmake (modified) (4 diffs)

code/branches/buildsystem2/cmake/CheckOGREPlugins.cmake

@@ -46 +46 @@
       IF(NOT OGRE_PLUGIN_${_plugin}_OPTIMIZED)
         MESSAGE(FATAL_ERROR "Could not find OGRE plugin named ${_plugin}")
-      ENDIF(NOT OGRE_PLUGIN_${_plugin}_OPTIMIZED)
+      ENDIF()
     ELSEIF(OGRE_PLUGIN_${_plugin}_OPTIMIZED)
       SET(OGRE_RENDER_SYSTEM_FOUND TRUE)
-    ENDIF(NOT ${_plugin} MATCHES "RenderSystem")
+    ENDIF()
 
     IF(OGRE_PLUGIN_${_plugin}_OPTIMIZED)
@@ -55 +55 @@
       IF(NOT OGRE_PLUGIN_${_plugin}_DEBUG)
         SET(OGRE_PLUGIN_${_plugin}_DEBUG ${OGRE_PLUGIN_${_plugin}_OPTIMIZED} CACHE STRING "" FORCE)
-      ENDIF(NOT OGRE_PLUGIN_${_plugin}_DEBUG)
+      ENDIF()
       MARK_AS_ADVANCED(OGRE_PLUGIN_${_plugin}_OPTIMIZED OGRE_PLUGIN_${_plugin}_DEBUG)
 
@@ -63 +63 @@
       IF(OGRE_PLUGINS_FOLDER_RELEASE AND NOT OGRE_PLUGINS_FOLDER_RELEASE STREQUAL _release_folder)
         MESSAGE(FATAL_ERROR "Ogre release plugins have to be in the same folder!")
-      ENDIF(OGRE_PLUGINS_FOLDER_RELEASE AND NOT OGRE_PLUGINS_FOLDER_RELEASE STREQUAL _release_folder)
+      ENDIF()
       SET(OGRE_PLUGINS_FOLDER_RELEASE ${_release_folder})
       GET_FILENAME_COMPONENT(_debug_folder ${OGRE_PLUGIN_${_plugin}_DEBUG} PATH)
       IF(OGRE_PLUGINS_FOLDER_DEBUG AND NOT OGRE_PLUGINS_FOLDER_DEBUG STREQUAL _debug_folder)
         MESSAGE(FATAL_ERROR "Ogre debug plugins have to be in the same folder!")
-      ENDIF(OGRE_PLUGINS_FOLDER_DEBUG AND NOT OGRE_PLUGINS_FOLDER_DEBUG STREQUAL _debug_folder)
+      ENDIF()
       SET(OGRE_PLUGINS_FOLDER_DEBUG ${_debug_folder})
 
@@ -77 +77 @@
         IF(OGRE_PLUGIN_${_plugin}_DEBUG MATCHES "_d\\.|_d$")
           LIST(APPEND OGRE_PLUGINS_DEBUG "${_plugin}_d")
-        ELSE(OGRE_PLUGIN_${_plugin}_DEBUG MATCHES "_d\\.|_d$")
+        ELSE()
           LIST(APPEND OGRE_PLUGINS_DEBUG "${_plugin}d")
-        ENDIF(OGRE_PLUGIN_${_plugin}_DEBUG MATCHES "_d\\.|_d$")
-      ELSE(OGRE_PLUGIN_${_plugin}_DEBUG)
+        ENDIF()
+      ELSE()
         LIST(APPEND OGRE_PLUGINS_DEBUG ${_plugin})
-      ENDIF(OGRE_PLUGIN_${_plugin}_DEBUG)
+      ENDIF()
     ENDIF(OGRE_PLUGIN_${_plugin}_OPTIMIZED)
   ENDFOREACH(_plugin)
   IF(NOT OGRE_RENDER_SYSTEM_FOUND)
       MESSAGE(FATAL_ERROR "Could not find an OGRE render system plugin")
-  ENDIF(NOT OGRE_RENDER_SYSTEM_FOUND)
+  ENDIF()
 
   # List has to be comma separated for orxonox.ini