Changeset 2624 for code/branches/buildsystem2/bin-config

Timestamp:

Jan 30, 2009, 12:48:20 PM (16 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/bin-config/CMakeLists.txt (modified) (3 diffs)

code/branches/buildsystem2/bin-config/CMakeLists.txt

@@ -25 +25 @@
     IF(${_build_config} MATCHES "Rel")
       SET(_build_config_short "Release")
-    ELSE(${_build_config} MATCHES "Rel")
+    ELSE()
       SET(_build_config_short "Debug")
-    ENDIF(${_build_config} MATCHES "Rel")
+    ENDIF()
     IF(EXISTS ${CMAKE_CURRENT_SOURCE_DIR}/${_build_config_short}/${_file_name})
       SET(_in_file ${CMAKE_CURRENT_SOURCE_DIR}/${_build_config_short}/${_file_name})
-    ELSE(EXISTS ${CMAKE_CURRENT_SOURCE_DIR}/${_build_config_short}/${_file_name})
+    ELSE()
       SET(_in_file ${CMAKE_CURRENT_SOURCE_DIR}/${_file_name})
-    ENDIF(EXISTS ${CMAKE_CURRENT_SOURCE_DIR}/${_build_config_short}/${_file_name})
+    ENDIF()
 
     # Copy to the folder named like the build config for Visual Studio
     IF(CMAKE_CONFIGURATION_TYPES)
       SET(_out_file ${CMAKE_RUNTIME_OUTPUT_DIRECTORY}/${_build_config}/${_file_name})
-    ELSE(CMAKE_CONFIGURATION_TYPES)
+    ELSE()
       SET(_out_file ${CMAKE_RUNTIME_OUTPUT_DIRECTORY}/${_file_name})
-    ENDIF(CMAKE_CONFIGURATION_TYPES)
+    ENDIF()
     # Only copy if target file doesn't exist. This may result in problems but
     # otherwise we might delete a user's config
-    IF (NOT EXISTS ${_out_file} OR _read_only)
+    IF(NOT EXISTS ${_out_file} OR _read_only)
       CONFIGURE_FILE(${_in_file} ${_out_file} @ONLY)
-    ENDIF (NOT EXISTS ${_out_file} OR _read_only)
+    ENDIF()
   ENDFOREACH(_build_config)
 ENDMACRO(CONFIGURE_FILES)
@@ -51 +51 @@
 IF(CMAKE_CONFIGURATION_TYPES)
   SET(BUILD_CONFIGS ${CMAKE_CONFIGURATION_TYPES})
-ELSE(CMAKE_CONFIGURATION_TYPES)
+ELSE()
   SET(CONFIG_OUT_PATHS_REL ".")
   SET(BUILD_CONFIGS ${CMAKE_BUILD_TYPE})
-ENDIF(CMAKE_CONFIGURATION_TYPES)
+ENDIF()
 
 FOREACH(_file_name ${READ_ONLY_CONFIG_FILES})
@@ -77 +77 @@
     SET(RUN_SCRIPT run)
   ENDIF(WIN32)
-  IF (NOT EXISTS ${CMAKE_SOURCE_DIR}/${RUN_SCRIPT})
+  IF(NOT EXISTS ${CMAKE_SOURCE_DIR}/${RUN_SCRIPT})
     CONFIGURE_FILE(${CMAKE_CURRENT_SOURCE_DIR}/${RUN_SCRIPT} ${CMAKE_SOURCE_DIR}/${RUN_SCRIPT} @ONLY)
-  ENDIF (NOT EXISTS ${CMAKE_SOURCE_DIR}/${RUN_SCRIPT})
+  ENDIF()
 ENDIF(NOT CMAKE_CONFIGURATION_TYPES)