Changeset 2624 for code/branches/buildsystem2/src

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.

Location:

code/branches/buildsystem2/src

Files:

• CMakeLists.txt (modified) (1 diff)
• ceguilua/CMakeLists.txt (modified) (2 diffs)
• core/CMakeLists.txt (modified) (1 diff)
• cpptcl/CMakeLists.txt (modified) (2 diffs)
• network/CMakeLists.txt (modified) (2 diffs)
• ogreceguirenderer/CMakeLists.txt (modified) (1 diff)
• ois/CMakeLists.txt (modified) (2 diffs)
• orxonox/CMakeLists.txt (modified) (3 diffs)
• tinyxml/CMakeLists.txt (modified) (1 diff)
• tolua/CMakeLists.txt (modified) (1 diff)
• util/CMakeLists.txt (modified) (1 diff)

code/branches/buildsystem2/src/CMakeLists.txt

@@ -54 +54 @@
   IF(NOT IS_DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR}/ceguilua/ceguilua-${CEGUI_VERSION})
     MESSAGE(FATAL_ERROR "CEGUILua version not found in src folder. Update list of supported versions in LibraryConfig.cmake!")
-  ENDIF(NOT IS_DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR}/ceguilua/ceguilua-${CEGUI_VERSION})
+  ENDIF()
 
   INCLUDE_DIRECTORIES(ceguilua/ceguilua-${CEGUI_VERSION})
   ADD_SUBDIRECTORY(ceguilua)
-ENDIF(CEGUILUA_USE_INTERNAL_LIBRARY)
+ENDIF()
 
 ADD_SUBDIRECTORY(cpptcl)

code/branches/buildsystem2/src/ceguilua/CMakeLists.txt

@@ -21 +21 @@
   IF(_compare_result EQUAL 1)
     BREAK() # _version > CEGUI_VERSION
-  ENDIF(_compare_result EQUAL 1)
+  ENDIF()
   ADD_SUBDIRECTORY(ceguilua-${_version})
 ENDFOREACH(_version)
@@ -53 +53 @@
 )
 
-IF (NOT WIN32)
+IF(NOT WIN32)
   INSTALL(TARGETS ceguilua_orxonox LIBRARY DESTINATION lib)
-ENDIF (NOT WIN32)
+ENDIF()

code/branches/buildsystem2/src/core/CMakeLists.txt

@@ -64 +64 @@
 )
 
-IF (NOT WIN32)
+IF(NOT WIN32)
   INSTALL(TARGETS core LIBRARY DESTINATION lib)
-ENDIF (NOT WIN32)
+ENDIF()

code/branches/buildsystem2/src/cpptcl/CMakeLists.txt

@@ -16 +16 @@
 IF(MSVC)
   ADD_LIBRARY(cpptcl_orxonox STATIC ${CPPTCL_FILES})
-ELSE(MSVC)
+ELSE()
   ADD_LIBRARY(cpptcl_orxonox SHARED ${CPPTCL_FILES})
-ENDIF(MSVC)
+ENDIF()
 
 TARGET_LINK_LIBRARIES(cpptcl_orxonox
@@ -24 +24 @@
 )
 
-IF (NOT WIN32)
+IF(NOT WIN32)
   INSTALL(TARGETS cpptcl_orxonox LIBRARY DESTINATION lib)
-ENDIF (NOT WIN32)
+ENDIF()

code/branches/buildsystem2/src/network/CMakeLists.txt

@@ -22 +22 @@
 IF(MINGW)
   ADD_LIBRARY(network ${NETWORK_FILES})
-ELSE(MINGW)
+ELSE()
   ADD_LIBRARY(network SHARED ${NETWORK_FILES})
-ENDIF(MINGW)
+ENDIF()
 
 SET_TARGET_PROPERTIES(network PROPERTIES DEFINE_SYMBOL "NETWORK_SHARED_BUILD")
@@ -35 +35 @@
 )
 
-IF (NOT WIN32)
+IF(NOT WIN32)
   INSTALL(TARGETS network LIBRARY DESTINATION lib)
-ENDIF (NOT WIN32)
+ENDIF()
 
 # build those parts only on request.
 IF(NETWORK_TESTING_ENABLED)
   ##### test for gamestate stuff #####
-  SET( TEST_SRC_FILES
+  SET(TEST_SRC_FILES
     ${NETWORK_SRC_FILES}
   )
   ADD_EXECUTABLE(networktest ${TEST_SRC_FILES})
-  TARGET_LINK_LIBRARIES( networktest
+  TARGET_LINK_LIBRARIES(networktest
     ${OGRE_LIBRARY}
     network

code/branches/buildsystem2/src/ogreceguirenderer/CMakeLists.txt

@@ -16 +16 @@
   ${CEGUI_LIBRARY}
 )
-IF (NOT WIN32)
+IF(NOT WIN32)
   INSTALL(TARGETS ogreceguirenderer_orxonox LIBRARY DESTINATION lib)
-ENDIF (NOT WIN32)
+ENDIF()

code/branches/buildsystem2/src/ois/CMakeLists.txt

@@ -29 +29 @@
 ELSEIF(UNIX)
   ADD_SUBDIRECTORY(linux)
-ENDIF (WIN32)
+ENDIF()
 
 GENERATE_SOURCE_GROUPS(${OIS_FILES})
@@ -36 +36 @@
 INCLUDE_DIRECTORIES(.)
 
-ADD_LIBRARY(ois_orxonox SHARED ${OIS_FILES} )
+ADD_LIBRARY(ois_orxonox SHARED ${OIS_FILES})
 SET_TARGET_PROPERTIES(ois_orxonox PROPERTIES DEFINE_SYMBOL "OIS_NONCLIENT_BUILD")
 
 IF(WIN32)
-  TARGET_LINK_LIBRARIES( ois_orxonox ${DIRECTX_LIBRARIES} )
-ENDIF(WIN32)
+  TARGET_LINK_LIBRARIES(ois_orxonox ${DIRECTX_LIBRARIES})
+ENDIF()
 

code/branches/buildsystem2/src/orxonox/CMakeLists.txt

@@ -27 +27 @@
 
 IF(NETWORKTRAFFIC_TESTING_ENABLED)
-
   SET(ORXONOXS_SRC_FILES
     GraphicsEngine.cc
@@ -33 +32 @@
     CameraManager.cc
   )
-
   ADD_LIBRARY(orxonoxs SHARED ${ORXONOXS_SRC_FILES})
 ENDIF(NETWORKTRAFFIC_TESTING_ENABLED)
@@ -61 +59 @@
   IF(CMAKE_CL_64)
     SET(MSVC_PLATFORM "x64")
-  ELSE(CMAKE_CL_64)
+  ELSE()
     SET(MSVC_PLATFORM "Win32")
-  ENDIF(CMAKE_CL_64)
+  ENDIF()
   CONFIGURE_FILE("${CMAKE_CURRENT_SOURCE_DIR}/orxonox.vcproj.user" "${CMAKE_CURRENT_BINARY_DIR}/orxonox.vcproj.user")
 ENDIF(MSVC)
 
-IF (NOT WIN32)
+IF(NOT WIN32)
   INSTALL(TARGETS orxonox RUNTIME DESTINATION bin)
-ENDIF (NOT WIN32)
+ENDIF()

code/branches/buildsystem2/src/tinyxml/CMakeLists.txt

@@ -15 +15 @@
 IF(MSVC)
   ADD_LIBRARY(tinyxml++_orxonox STATIC ${TINYXML++_FILES})
-ELSE(MSVC)
+ELSE()
   ADD_LIBRARY(tinyxml++_orxonox SHARED ${TINYXML++_FILES})
-ENDIF(MSVC)
+ENDIF()
 
-IF (NOT WIN32)
+IF(NOT WIN32)
   INSTALL(TARGETS tinyxml++_orxonox LIBRARY DESTINATION lib)
-ENDIF (NOT WIN32)
+ENDIF()

code/branches/buildsystem2/src/tolua/CMakeLists.txt

@@ -19 +19 @@
 TARGET_LINK_LIBRARIES(tolua++_orxonox ${LUA_LIBRARIES})
 
-IF (NOT WIN32)
+IF(NOT WIN32)
 #  INSTALL(TARGETS tolualib_orxonox LIBRARY DESTINATION lib)
-ENDIF (NOT WIN32)
+ENDIF()
 
 

code/branches/buildsystem2/src/util/CMakeLists.txt

@@ -23 +23 @@
 TARGET_LINK_LIBRARIES(util ${OGRE_LIBRARY})
 
-IF (NOT WIN32)
+IF(NOT WIN32)
   INSTALL(TARGETS util LIBRARY DESTINATION lib)
-ENDIF (NOT WIN32)
+ENDIF()