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

code/branches/buildsystem2/cmake/LibraryConfig.cmake

@@ -27 +27 @@
   ELSEIF(EXISTS ${CMAKE_MODULE_PATH}/${LIBRARY_CONFIG_USER_SCRIPT})
     INCLUDE(${CMAKE_MODULE_PATH}/${LIBRARY_CONFIG_USER_SCRIPT})
-  ENDIF(EXISTS ${CMAKE_MODULE_PATH}/${LIBRARY_CONFIG_USER_SCRIPT}.cmake)
+  ENDIF()
 ENDIF(LIBRARY_CONFIG_USER_SCRIPT)
 
@@ -66 +66 @@
   IF(version_comparison LESS 0)
     SET(LUA_VERSION_REQUEST 5.0)
-  ELSE(version_comparison LESS 0)
+  ELSE()
     SET(LUA_VERSION_REQUEST 5.1)
-  ENDIF(version_comparison LESS 0)
-ELSE(CEGUILUA_USE_EXTERNAL_LIBRARY)
+  ENDIF()
+ELSE()
   SET(LUA_VERSION_REQUEST 5)
-ENDIF(CEGUILUA_USE_EXTERNAL_LIBRARY)
+ENDIF()
 FIND_PACKAGE(Lua ${LUA_VERSION_REQUEST} EXACT REQUIRED)
 
@@ -81 +81 @@
 IF(DEFINED OPENAL_FOUND_FIRST_TIME)
   SET(OPENAL_FOUND_FIRST_TIME FALSE CACHE INTERNAL "")
-ELSE(DEFINED OPENAL_FOUND_FIRST_TIME)
+ELSE()
   SET(OPENAL_FOUND_FIRST_TIME TRUE CACHE INTERNAL "")
   STRING(REGEX REPLACE "^(.*)/AL$" "\\1" _openal_dir_2 ${OPENAL_INCLUDE_DIR})
   IF(_openal_dir_2)
     SET(OPENAL_INCLUDE_DIR ${OPENAL_INCLUDE_DIR} ${_openal_dir_2} CACHE STRING "" FORCE)
-  ENDIF(_openal_dir_2)
-ENDIF(DEFINED OPENAL_FOUND_FIRST_TIME)
+  ENDIF()
+ENDIF()
 # Hide variables created by the script
 MARK_AS_ADVANCED(