Merge with develop

code/CMakeLists.txt

@@ -36,7 +36,7 @@ IF(COMMAND cmake_policy)
   IF(POLICY CMP0020)
     CMAKE_POLICY(SET CMP0020 NEW)
   ENDIF()
-ENDIF(COMMAND cmake_policy)
+ENDIF()
 
 INCLUDE(nel)
 INCLUDE(ConfigureChecks)
@@ -75,15 +75,15 @@ SET(CMAKE_ARCHIVE_OUTPUT_DIRECTORY ${CMAKE_BINARY_DIR}/lib)
 # DLL should be in the same directory as EXE under Windows
 IF(WIN32)
   SET(CMAKE_LIBRARY_OUTPUT_DIRECTORY ${CMAKE_BINARY_DIR}/bin)
-ELSE(WIN32)
+ELSE()
   SET(CMAKE_LIBRARY_OUTPUT_DIRECTORY ${CMAKE_BINARY_DIR}/lib)
-ENDIF(WIN32)
+ENDIF()
 
 IF(WIN32)
   IF(WITH_MFC)
     FIND_PACKAGE(MFC QUIET)
-  ENDIF(WITH_MFC)
+  ENDIF()
-ENDIF(WIN32)
+ENDIF()
 
 #-----------------------------------------------------------------------------
 # Set default config options
@@ -112,8 +112,8 @@ IF(WIN32)
 
   IF(WITH_MFC)
     FIND_PACKAGE(CustomMFC REQUIRED)
-  ENDIF(WITH_MFC)
+  ENDIF()
-ENDIF(WIN32)
+ENDIF()
 
 FIND_PACKAGE(ZLIB REQUIRED)
 FIND_PACKAGE(LibXml2 REQUIRED)
@@ -124,13 +124,13 @@ FIND_PACKAGE(Jpeg)
 
 IF(WITH_STATIC_LIBXML2)
   SET(LIBXML2_DEFINITIONS ${LIBXML2_DEFINITIONS} -DLIBXML_STATIC)
-ENDIF(WITH_STATIC_LIBXML2)
+ENDIF()
 
 IF(WITH_LIBXML2_ICONV)
   FIND_PACKAGE(Iconv REQUIRED)
   INCLUDE_DIRECTORIES(${ICONV_INCLUDE_DIR})
   SET(LIBXML2_LIBRARIES ${LIBXML2_LIBRARIES} ${ICONV_LIBRARIES})
-ENDIF(WITH_LIBXML2_ICONV)
+ENDIF()
 
 IF(WITH_STATIC)
   # libxml2 could need winsock2 library
@@ -145,20 +145,20 @@ IF(WITH_STATIC)
       SET(LIBXML2_LIBRARIES ${LIBXML2_LIBRARIES} ${LIBLZMA_LIBRARIES})
     ENDIF()
   ENDIF()
-ENDIF(WITH_STATIC)
+ENDIF()
 
 INCLUDE(${CMAKE_CURRENT_SOURCE_DIR}/CMakeModules/PCHSupport.cmake)
 
 IF(FINAL_VERSION)
   ADD_DEFINITIONS(-DFINAL_VERSION=1)
-ENDIF(FINAL_VERSION)
+ENDIF()
 
 IF(WITH_SSE2)
   ADD_DEFINITIONS(-DNL_HAS_SSE2)
   IF(WITH_SSE3)
     ADD_DEFINITIONS(-DNL_HAS_SSE3)
-  ENDIF(WITH_SSE3)
+  ENDIF()
-ENDIF(WITH_SSE2)
+ENDIF()
 
 IF(APPLE_CERTIFICATE)
   # Find codesign_allocate
@@ -399,16 +399,16 @@ IF(WITH_QT)
 
   # Use Qt 4
   FIND_PACKAGE(Qt4 COMPONENTS QtCore QtGui QtXml QtOpenGL REQUIRED)
-ENDIF(WITH_QT)
+ENDIF()
 
 IF(WITH_ASSIMP)
   FIND_PACKAGE(assimp REQUIRED)
-ENDIF(WITH_ASSIMP)
+ENDIF()
 
 IF(WITH_NEL)
   IF(WITH_NEL_TESTS)
     FIND_PACKAGE(CppTest)
-  ENDIF(WITH_NEL_TESTS)
+  ENDIF()
 
   IF(WITH_GUI)
     FIND_PACKAGE(Luabind REQUIRED)
@@ -446,19 +446,19 @@ IF(WITH_NEL)
 
   INCLUDE_DIRECTORIES(${CMAKE_CURRENT_SOURCE_DIR}/nel/include)
   ADD_SUBDIRECTORY(nel)
-ENDIF(WITH_NEL)
+ENDIF()
 
 IF(WITH_RYZOM)
   ADD_SUBDIRECTORY(ryzom)
-ENDIF(WITH_RYZOM)
+ENDIF()
 
 IF(WITH_NELNS)
   ADD_SUBDIRECTORY(nelns)
-ENDIF(WITH_NELNS)
+ENDIF()
 
 IF(WITH_SNOWBALLS)
   ADD_SUBDIRECTORY(snowballs2)
-ENDIF(WITH_SNOWBALLS)
+ENDIF()
 
 IF(WITH_TOOLS)
   ADD_SUBDIRECTORY(tool)
@@ -466,22 +466,22 @@ ENDIF()
 
 IF(WITH_STUDIO)
   ADD_SUBDIRECTORY(studio)
-ENDIF(WITH_STUDIO)
+ENDIF()
 
 # To build the documention, you will have to enable it
 # and then do the equivalent of "make DoxygenDoc".
 IF(BUILD_DOCUMENTATION)
     IF(DOT)
         SET(HAVE_DOT YES)
-    ELSE(DOT)
+    ELSE()
         SET(HAVE_DOT NO)
-    ENDIF(DOT)
+    ENDIF()
     # This processes our Doxyfile.in and substitutes paths to generate
     # a final Doxyfile
     CONFIGURE_FILE(${CMAKE_SOURCE_DIR}/doc/Doxyfile.cmake.in ${CMAKE_BINARY_DIR}/doc/Doxyfile)
 
     ADD_CUSTOM_TARGET(DoxygenDoc ${DOXYGEN} ${CMAKE_BINARY_DIR}/doc/Doxyfile)
-ENDIF(BUILD_DOCUMENTATION)
+ENDIF()
 
 IF(WITH_NEL_TESTS)
   ENABLE_TESTING()
@@ -491,8 +491,8 @@ IF(WITH_NEL_TESTS)
     SET(SVNCOMMAND svn)
     SET(SVNSOURCEDIR http://dev.ryzom.com/svn/trunk/nel)
     SET(GENERATELOGS svn2cl)
-  ENDIF(BUILD_DASHBOARD)
+  ENDIF()
-ENDIF(WITH_NEL_TESTS)
+ENDIF()
 
 # packaging information
 SET(CPACK_PACKAGE_DESCRIPTION_SUMMARY "Ryzom Core MMORPG Framework")
@@ -524,10 +524,10 @@ IF(WIN32)
   #SET(CPACK_GENERATOR "NSIS")
   SET(CPACK_GENERATOR "NSIS;ZIP")
   SET(CPACK_SOURCE_GENERATOR "ZIP")
-ELSE(WIN32)
+ELSE()
   SET(CPACK_GENERATOR "TGZ")
   SET(CPACK_SOURCE_GENERATOR "TGZ")
-ENDIF(WIN32)
+ENDIF()
 set(CPACK_SOURCE_IGNORE_FILES
 	"~$"
 	"\\\\.cvsignore$"
@@ -545,8 +545,8 @@ IF(WIN32)
         "${QT_LIBRARY_DIR}/../bin/QtXmld4.dll"
         "${QT_LIBRARY_DIR}/../bin/QtCored4.dll"
         DESTINATION ${NL_BIN_PREFIX})
-    ENDIF(WITH_QT)
+    ENDIF()
-  ELSE(NOT CMAKE_BUILD_TYPE STREQUAL "Release")
+  ELSE()
     IF(WITH_QT)
       INCLUDE(${QT_USE_FILE})
       INSTALL(FILES
@@ -554,8 +554,8 @@ IF(WIN32)
         "${QT_LIBRARY_DIR}/../bin/QtXml4.dll"
         "${QT_LIBRARY_DIR}/../bin/QtCore4.dll"
         DESTINATION ${NL_BIN_PREFIX})
-    ENDIF(WITH_QT)
+    ENDIF()
-  ENDIF(NOT CMAKE_BUILD_TYPE STREQUAL "Release")
+  ENDIF()
 
   # Install CEGUI and its dependencies.
   IF(WITH_NEL_CEGUI)
@@ -565,14 +565,14 @@ IF(WIN32)
     INSTALL(FILES "${CEGUI_LIB_DIR}/CEGUIFalagardWRBase.dll" DESTINATION ${NL_BIN_PREFIX})
     INSTALL(FILES "${CEGUI_LIB_DIR}/Devil.dll" DESTINATION ${NL_BIN_PREFIX})
     INSTALL(FILES "${CEGUI_LIB_DIR}/ILU.dll" DESTINATION ${NL_BIN_PREFIX})
-  ENDIF(WITH_NEL_CEGUI)
+  ENDIF()
 
   # Only the tools require MFC.
   IF(WITH_TOOLS)
     SET(CMAKE_INSTALL_MFC_LIBRARIES TRUE)
-  ENDIF(WITH_TOOLS)
+  ENDIF()
   #INCLUDE(InstallRequiredSystemLibraries)
-ENDIF(WIN32)
+ENDIF()
 
 INCLUDE(CPack)
 
@@ -582,4 +582,4 @@ INCLUDE(CMakePackaging.txt)
 #INCLUDE(UseDebian)
 #IF(DEBIAN_FOUND)
 #  ADD_DEBIAN_TARGETS(nel)
-#ENDIF(DEBIAN_FOUND)
+#ENDIF()

code/CMakeModules/CheckDepends.cmake

@@ -24,8 +24,8 @@ MACRO(CHECK_UNDEFINED_SYMBOL MYLIBRARY SYMBOL SYMBOL_FOUND)
       IF(NOT NM_SYMBOL MATCHES ${SYMBOL})
         SET(${SYMBOL_FOUND} FALSE)
 #        MESSAGE(STATUS "Defined symbol ${SYMBOL} detected in ${${MYLIBRARY}}")
-      ENDIF(NOT NM_SYMBOL MATCHES ${SYMBOL})
+      ENDIF()
-    ENDIF(CMAKE_NM)
+    ENDIF()
   ELSEIF(UNIX)
     SET(CMAKE_OBJDUMP objdump)
     IF(CMAKE_OBJDUMP)
@@ -35,11 +35,11 @@ MACRO(CHECK_UNDEFINED_SYMBOL MYLIBRARY SYMBOL SYMBOL_FOUND)
       IF(NOT OBJDUMP_SYMBOL MATCHES "UND")
         #MESSAGE(STATUS "${${MYLIBRARY}} does not use symbol ${SYMBOL}")
         SET(${SYMBOL_FOUND} FALSE)
-      ELSE(NOT OBJDUMP_SYMBOL MATCHES "UND")
+      ELSE()
         #MESSAGE(STATUS "${${MYLIBRARY}} uses symbol ${SYMBOL}")
-      ENDIF(NOT OBJDUMP_SYMBOL MATCHES "UND")
+      ENDIF()
-    ENDIF(CMAKE_OBJDUMP)
+    ENDIF()
-  ENDIF(WIN32)
+  ENDIF()
 ENDMACRO(CHECK_UNDEFINED_SYMBOL)
 
 # CHECK_LINKED_LIBRARY
@@ -66,8 +66,8 @@ MACRO(CHECK_LINKED_LIBRARY MYLIBRARY OTHERLIBRARY LIBRARY_FOUND)
       IF(OTOOL_LIBRARY MATCHES "${LIBNAME}")
         SET(${LIBRARY_FOUND} TRUE)
 #        MESSAGE(STATUS "Library ${LIBNAME} already linked to ${${MYLIBRARY}}")
-      ENDIF(OTOOL_LIBRARY MATCHES "${LIBNAME}")
+      ENDIF()
-    ENDIF(CMAKE_OTOOL)
+    ENDIF()
   ELSEIF(UNIX)
     SET(CMAKE_OBJDUMP objdump)
     IF(CMAKE_OBJDUMP)
@@ -79,11 +79,11 @@ MACRO(CHECK_LINKED_LIBRARY MYLIBRARY OTHERLIBRARY LIBRARY_FOUND)
       IF(OBJDUMP_LIBRARY MATCHES "NEEDED")
         #MESSAGE(STATUS "${${MYLIBRARY}} references to ${LIBNAME}.")
         SET(${LIBRARY_FOUND} TRUE)
-      ELSE(OBJDUMP_LIBRARY MATCHES "NEEDED")
+      ELSE()
         #MESSAGE(STATUS "${${MYLIBRARY}} does not reference to ${LIBNAME}!")
-      ENDIF(OBJDUMP_LIBRARY MATCHES "NEEDED")
+      ENDIF()
-    ENDIF(CMAKE_OBJDUMP)
+    ENDIF()
-  ENDIF(WIN32)
+  ENDIF()
 ENDMACRO(CHECK_LINKED_LIBRARY)
 
 MACRO(CHECK_DEPENDS MYLIBRARY OTHERLIBRARY SYMBOL MUSTLINK)
@@ -91,13 +91,13 @@ MACRO(CHECK_DEPENDS MYLIBRARY OTHERLIBRARY SYMBOL MUSTLINK)
 
   IF(SYMBOL_FOUND)
     CHECK_LINKED_LIBRARY(MYLIBRARY OTHERLIBRARY LIBRARY_FOUND)
-  ENDIF(SYMBOL_FOUND)
+  ENDIF()
 
   IF(SYMBOL_FOUND AND NOT LIBRARY_FOUND)
     SET(${MUSTLINK} YES)
-  ELSE(SYMBOL_FOUND AND NOT LIBRARY_FOUND)
+  ELSE()
     SET(${MUSTLINK} NO)
-  ENDIF(SYMBOL_FOUND AND NOT LIBRARY_FOUND)
+  ENDIF()
 ENDMACRO(CHECK_DEPENDS)
 
 # LINK_DEPENDS
@@ -116,23 +116,23 @@ MACRO(LINK_DEPENDS LIBRARIES MYLIBRARY OTHERLIBRARY SYMBOL)
     IF(WIN32 OR WITH_STATIC)
       # In static, we link all libraries because it will keep only used symbols
       SET(MUST_LINK TRUE)
-    ELSE(WIN32 OR WITH_STATIC)
+    ELSE()
       CHECK_UNDEFINED_SYMBOL(${MYLIBRARY} ${SYMBOL} SYMBOL_FOUND)
 
       IF(SYMBOL_FOUND)
         CHECK_LINKED_LIBRARY(${MYLIBRARY} ${OTHERLIBRARY} LIBRARY_FOUND)
-      ENDIF(SYMBOL_FOUND)
+      ENDIF()
 
       IF(SYMBOL_FOUND AND NOT LIBRARY_FOUND)
         MESSAGE(STATUS "Underlinking found: ${${MYLIBRARY}} needs ${${OTHERLIBRARY}} but is not linked to, manually linking...")
         SET(MUST_LINK TRUE)
-      ENDIF(SYMBOL_FOUND AND NOT LIBRARY_FOUND)
+      ENDIF()
-    ENDIF(WIN32 OR WITH_STATIC)
+    ENDIF()
-  ENDIF(${MYLIBRARY} AND ${OTHERLIBRARY} AND NOT ${OTHERLIBRARY}_LINKED)
+  ENDIF()
   IF(MUST_LINK)
     MESSAGE(STATUS "Linking with ${${OTHERLIBRARY}}")
     SET(${LIBRARIES} ${${LIBRARIES}} ${${OTHERLIBRARY}})
     SET(${OTHERLIBRARY}_LINKED TRUE)
-  ENDIF(MUST_LINK)
+  ENDIF()
 ENDMACRO(LINK_DEPENDS)
 

code/CMakeModules/Find3dsMaxSDK.cmake

@@ -75,8 +75,8 @@ if(MAXSDK_FOUND)
       ${MAXSDK_PARAMBLK2_LIBRARY}
       ${MAXSDK_BMM_LIBRARY} )
 
-else(MAXSDK_FOUND)
+ELSE()
     set(MAXSDK_LIBRARIES)
-endif(MAXSDK_FOUND)
+ENDIF()
 
 mark_as_advanced(MAXSDK_INCLUDE_DIR MAXSDK_LIBRARY)

code/CMakeModules/FindCEGUI.cmake

@@ -7,7 +7,7 @@
 IF(CEGUI_LIBRARY AND CEGUI_INCLUDE_DIRS)
   # in cache already
   SET(CEGUI_FIND_QUIETLY TRUE)
-ENDIF(CEGUI_LIBRARY AND CEGUI_INCLUDE_DIRS)
+ENDIF()
 
 
 FIND_PATH(CEGUI_INCLUDE_DIRS
@@ -45,9 +45,9 @@ IF(CEGUI_LIBRARY AND CEGUI_INCLUDE_DIRS)
   SET(CEGUI_INCLUDE_DIRS "${CEGUI_INCLUDE_DIRS}/CEGUI")
   IF(NOT CEGUI_FIND_QUIETLY)
     MESSAGE(STATUS "Found CEGUI: ${CEGUI_LIBRARY}")
-  ENDIF(NOT CEGUI_FIND_QUIETLY)
+  ENDIF()
-ELSE(CEGUI_LIBRARY AND CEGUI_INCLUDE_DIRS)
+ELSE()
   IF(NOT CEGUI_FIND_QUIETLY)
     MESSAGE(STATUS "Warning: Unable to find CEGUI!")
-  ENDIF(NOT CEGUI_FIND_QUIETLY)
+  ENDIF()
-ENDIF(CEGUI_LIBRARY AND CEGUI_INCLUDE_DIRS)
+ENDIF()

code/CMakeModules/FindCppTest.cmake

@@ -10,7 +10,7 @@
 IF(CPPTEST_LIBRARIES AND CPPTEST_INCLUDE_DIR)
   # in cache already
   SET(CPPTEST_FIND_QUIETLY TRUE)
-ENDIF(CPPTEST_LIBRARIES AND CPPTEST_INCLUDE_DIR)
+ENDIF()
 
 FIND_PATH(CPPTEST_INCLUDE_DIR 
   cpptest.h
@@ -30,7 +30,7 @@ SET(LIBRARY_NAME_DEBUG cpptestd)
 IF(WITH_STLPORT)
   SET(LIBRARY_NAME_RELEASE cpptest_stlport ${LIBRARY_NAME_RELEASE})
   SET(LIBRARY_NAME_DEBUG cpptest_stlportd ${LIBRARY_NAME_DEBUG})
-ENDIF(WITH_STLPORT)
+ENDIF()
 
 FIND_LIBRARY(CPPTEST_LIBRARY_RELEASE
   ${LIBRARY_NAME_RELEASE}
@@ -67,18 +67,18 @@ IF(CPPTEST_INCLUDE_DIR)
     SET(CPPTEST_LIBRARIES "optimized;${CPPTEST_LIBRARY_RELEASE}")
     IF(CPPTEST_LIBRARY_DEBUG)
       SET(CPPTEST_LIBRARIES "${CPPTEST_LIBRARIES};debug;${CPPTEST_LIBRARY_DEBUG}")
-    ENDIF(CPPTEST_LIBRARY_DEBUG)
+    ENDIF()
-  ENDIF(CPPTEST_LIBRARY_RELEASE)
+  ENDIF()
-ENDIF(CPPTEST_INCLUDE_DIR)
+ENDIF()
 
 IF(CPPTEST_FOUND)
   IF(NOT CPPTEST_FIND_QUIETLY)
     MESSAGE(STATUS "Found CppTest: ${CPPTEST_LIBRARIES}")
-  ENDIF(NOT CPPTEST_FIND_QUIETLY)
+  ENDIF()
-ELSE(CPPTEST_FOUND)
+ELSE()
   IF(NOT CPPTEST_FIND_QUIETLY)
     MESSAGE(STATUS "Warning: Unable to find CppTest!")
-  ENDIF(NOT CPPTEST_FIND_QUIETLY)
+  ENDIF()
-ENDIF(CPPTEST_FOUND)
+ENDIF()
 
 MARK_AS_ADVANCED(CPPTEST_LIBRARY_RELEASE CPPTEST_LIBRARY_DEBUG)

code/CMakeModules/FindCustomMFC.cmake

@@ -6,20 +6,20 @@
 
 IF(CustomMFC_FIND_REQUIRED)
   SET(MFC_FIND_REQUIRED TRUE)
-ENDIF(CustomMFC_FIND_REQUIRED)
+ENDIF()
 
 IF(NOT MFC_DIR)
   # If MFC have been found, remember their directory
   IF(VC_DIR)
     SET(MFC_STANDARD_DIR "${VC_DIR}/atlmfc")
-  ENDIF(VC_DIR)
+  ENDIF()
 
   FIND_PATH(MFC_DIR
     include/afxwin.h
     HINTS
     ${MFC_STANDARD_DIR}
   )
-ENDIF(NOT MFC_DIR)
+ENDIF()
 
 # Display an error message if MFC are not found, MFC_FOUND is updated
 # User will be able to update MFC_DIR to the correct directory
@@ -33,9 +33,9 @@ IF(MFC_FOUND)
   # Using 32 or 64 bits libraries
   IF(TARGET_X64)
     SET(MFC_LIBRARY_DIR "${MFC_DIR}/lib/amd64")
-  ELSE(TARGET_X64)
+  ELSE()
     SET(MFC_LIBRARY_DIR "${MFC_DIR}/lib")
-  ENDIF(TARGET_X64)
+  ENDIF()
 
   # Add MFC libraries directory to default library path
   LINK_DIRECTORIES(${MFC_LIBRARY_DIR})

code/CMakeModules/FindDSound.cmake

@@ -8,7 +8,7 @@
 if(DSOUND_INCLUDE_DIR)
     # Already in cache, be silent
     set(DSOUND_FIND_QUIETLY TRUE)
-endif(DSOUND_INCLUDE_DIR)
+ENDIF()
 
 find_path(DSOUND_INCLUDE_DIR dsound.h 
   "$ENV{DXSDK_DIR}" 
@@ -29,8 +29,8 @@ find_package_handle_standard_args(DSOUND DEFAULT_MSG
 
 if(DSOUND_FOUND)
     set(DSOUND_LIBRARIES ${DSOUND_LIBRARY})
-else(DSOUND_FOUND)
+ELSE()
     set(DSOUND_LIBRARIES)
-endif(DSOUND_FOUND)
+ENDIF()
 
 mark_as_advanced(DSOUND_INCLUDE_DIR DSOUND_LIBRARY)

code/CMakeModules/FindDirectXSDK.cmake

@@ -8,7 +8,7 @@
 IF(DXSDK_DIR)
   # Already in cache, be silent
   SET(DXSDK_FIND_QUIETLY TRUE)
-ENDIF(DXSDK_DIR)
+ENDIF()
 
 FIND_PATH(DXSDK_DIR
   "Include/dxsdkver.h"

code/CMakeModules/FindEFXUtil.cmake

@@ -7,7 +7,7 @@
 IF(EFXUTIL_LIBRARY AND EFXUTIL_INCLUDE_DIR)
   # in cache already
   SET(EFXUTIL_FIND_QUIETLY TRUE)
-ENDIF(EFXUTIL_LIBRARY AND EFXUTIL_INCLUDE_DIR)
+ENDIF()
 
 
 FIND_PATH(EFXUTIL_INCLUDE_DIR
@@ -42,9 +42,9 @@ IF(EFXUTIL_LIBRARY AND EFXUTIL_INCLUDE_DIR)
   SET(EFXUTIL_FOUND "YES")
   IF(NOT EFXUTIL_FIND_QUIETLY)
     MESSAGE(STATUS "Found EFX-Util: ${EFXUTIL_LIBRARY}")
-  ENDIF(NOT EFXUTIL_FIND_QUIETLY)
+  ENDIF()
-ELSE(EFXUTIL_LIBRARY AND EFXUTIL_INCLUDE_DIR)
+ELSE()
   IF(NOT EFXUTIL_FIND_QUIETLY)
     MESSAGE(STATUS "Warning: Unable to find EFX-Util!")
-  ENDIF(NOT EFXUTIL_FIND_QUIETLY)
+  ENDIF()
-ENDIF(EFXUTIL_LIBRARY AND EFXUTIL_INCLUDE_DIR)
+ENDIF()

code/CMakeModules/FindExternal.cmake

@@ -16,7 +16,7 @@ IF(WITH_STLPORT)
   SET(EXTERNAL_TEMP_PATH ${CMAKE_CURRENT_SOURCE_DIR}/external_stlport ${CMAKE_CURRENT_SOURCE_DIR}/../external_stlport ${EXTERNAL_TEMP_PATH})
   SET(EXTERNAL_TEMP_FILE "include/stlport/string")
   SET(EXTERNAL_NAME "external with STLport")
-ENDIF(WITH_STLPORT)
+ENDIF()
 
 FIND_PATH(EXTERNAL_PATH
   ${EXTERNAL_TEMP_FILE}

code/CMakeModules/FindFMOD.cmake

@@ -7,7 +7,7 @@
 IF(FMOD_LIBRARY AND FMOD_INCLUDE_DIR)
   # in cache already
   SET(FMOD_FIND_QUIETLY TRUE)
-ENDIF(FMOD_LIBRARY AND FMOD_INCLUDE_DIR)
+ENDIF()
 
 
 FIND_PATH(FMOD_INCLUDE_DIR
@@ -25,9 +25,9 @@ FIND_PATH(FMOD_INCLUDE_DIR
 
 IF(TARGET_X64)
   SET(FMOD_LIBRARY_NAMES fmod64 fmod)
-ELSE(TARGET_X64)
+ELSE()
   SET(FMOD_LIBRARY_NAMES fmodvc fmod)
-ENDIF(TARGET_X64)
+ENDIF()
 
 FIND_LIBRARY(FMOD_LIBRARY
   NAMES
@@ -49,9 +49,9 @@ IF(FMOD_LIBRARY AND FMOD_INCLUDE_DIR)
   SET(FMOD_FOUND "YES")
   IF(NOT FMOD_FIND_QUIETLY)
     MESSAGE(STATUS "Found FMOD: ${FMOD_LIBRARY}")
-  ENDIF(NOT FMOD_FIND_QUIETLY)
+  ENDIF()
-ELSE(FMOD_LIBRARY AND FMOD_INCLUDE_DIR)
+ELSE()
   IF(NOT FMOD_FIND_QUIETLY)
     MESSAGE(STATUS "Warning: Unable to find FMOD!")
-  ENDIF(NOT FMOD_FIND_QUIETLY)
+  ENDIF()
-ENDIF(FMOD_LIBRARY AND FMOD_INCLUDE_DIR)
+ENDIF()

code/CMakeModules/FindFreeType.cmake

@@ -7,7 +7,7 @@
 IF(FREETYPE_LIBRARIES AND FREETYPE_INCLUDE_DIRS)
   # in cache already
   SET(Freetype_FIND_QUIETLY TRUE)
-ENDIF(FREETYPE_LIBRARIES AND FREETYPE_INCLUDE_DIRS)
+ENDIF()
 
 FIND_PATH(FREETYPE_INCLUDE_DIRS
   freetype
@@ -24,7 +24,7 @@ FIND_PATH(FREETYPE_INCLUDE_DIRS
 
 IF(NOT FREETYPE_INCLUDE_DIRS)
   SET(FREETYPE_INCLUDE_DIRS "")
-ENDIF(NOT FREETYPE_INCLUDE_DIRS)
+ENDIF()
 
 # ft2build.h does not reside in the freetype include dir
 FIND_PATH(FREETYPE_ADDITIONAL_INCLUDE_DIR
@@ -42,7 +42,7 @@ FIND_PATH(FREETYPE_ADDITIONAL_INCLUDE_DIR
 # combine both include directories into one variable
 IF(FREETYPE_ADDITIONAL_INCLUDE_DIR)
   SET(FREETYPE_INCLUDE_DIRS ${FREETYPE_INCLUDE_DIRS} ${FREETYPE_ADDITIONAL_INCLUDE_DIR})
-ENDIF(FREETYPE_ADDITIONAL_INCLUDE_DIR)
+ENDIF()
 
 FIND_LIBRARY(FREETYPE_LIBRARY_RELEASE
   NAMES freetype libfreetype freetype219 freetype246
@@ -89,8 +89,8 @@ IF(FREETYPE_INCLUDE_DIRS)
     # Case where Freetype is compiled from sources (debug version is compiled by default)
     SET(FREETYPE_FOUND ON)
     SET(FREETYPE_LIBRARIES ${FREETYPE_LIBRARY_DEBUG})
-  ENDIF(FREETYPE_LIBRARY_RELEASE AND FREETYPE_LIBRARY_DEBUG)
+  ENDIF()
-ENDIF(FREETYPE_INCLUDE_DIRS)
+ENDIF()
 
 IF(FREETYPE_FOUND)
   IF(WITH_STATIC_EXTERNAL AND APPLE)
@@ -98,13 +98,13 @@ IF(FREETYPE_FOUND)
     IF(BZIP2_FOUND)
       SET(FREETYPE_INCLUDE_DIRS ${FREETYPE_INCLUDE_DIRS} ${BZIP2_INCLUDE_DIR})
       SET(FREETYPE_LIBRARIES ${FREETYPE_LIBRARIES} ${BZIP2_LIBRARIES})
-    ENDIF(BZIP2_FOUND)
+    ENDIF()
-  ENDIF(WITH_STATIC_EXTERNAL AND APPLE)
+  ENDIF()
   IF(NOT Freetype_FIND_QUIETLY)
     MESSAGE(STATUS "Found FreeType: ${FREETYPE_LIBRARIES}")
-  ENDIF(NOT Freetype_FIND_QUIETLY)
+  ENDIF()
-ELSE(FREETYPE_LIBRARY AND FREETYPE_INCLUDE_DIRS)
+ELSE()
   IF(NOT Freetype_FIND_QUIETLY)
     MESSAGE(STATUS "Warning: Unable to find FreeType!")
-  ENDIF(NOT Freetype_FIND_QUIETLY)
+  ENDIF()
-ENDIF(FREETYPE_FOUND)
+ENDIF()

code/CMakeModules/FindIconv.cmake

@@ -20,7 +20,7 @@ FIND_LIBRARY(ICONV_LIBRARIES NAMES iconv libiconv c PATHS /opt/local)
  
 IF(ICONV_INCLUDE_DIR AND ICONV_LIBRARIES) 
    SET(ICONV_FOUND TRUE) 
-ENDIF(ICONV_INCLUDE_DIR AND ICONV_LIBRARIES) 
+ENDIF() 
 
 set(CMAKE_REQUIRED_INCLUDES ${ICONV_INCLUDE_DIR})
 set(CMAKE_REQUIRED_LIBRARIES ${ICONV_LIBRARIES})
@@ -29,7 +29,7 @@ IF(ICONV_FOUND)
   set (CMAKE_C_FLAGS_BACKUP "${CMAKE_C_FLAGS}")
   if(ICONV_HAVE_WERROR)
     set (CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -Werror")
-  endif(ICONV_HAVE_WERROR)
+  ENDIF()
   check_c_source_compiles("
   #include <iconv.h>
   int main(){
@@ -43,19 +43,19 @@ IF(ICONV_FOUND)
   }
 " ICONV_SECOND_ARGUMENT_IS_CONST )
   set (CMAKE_C_FLAGS "${CMAKE_C_FLAGS_BACKUP}")
-ENDIF(ICONV_FOUND)
+ENDIF()
 set(CMAKE_REQUIRED_INCLUDES)
 set(CMAKE_REQUIRED_LIBRARIES)
 
 IF(ICONV_FOUND) 
   IF(NOT ICONV_FIND_QUIETLY) 
     MESSAGE(STATUS "Found Iconv: ${ICONV_LIBRARIES}") 
-  ENDIF(NOT ICONV_FIND_QUIETLY) 
+  ENDIF() 
-ELSE(ICONV_FOUND) 
+ELSE() 
   IF(Iconv_FIND_REQUIRED) 
     MESSAGE(FATAL_ERROR "Could not find Iconv") 
-  ENDIF(Iconv_FIND_REQUIRED) 
+  ENDIF() 
-ENDIF(ICONV_FOUND) 
+ENDIF() 
 
 MARK_AS_ADVANCED(
   ICONV_INCLUDE_DIR

code/CMakeModules/FindJpeg.cmake

@@ -7,7 +7,7 @@
 IF(JPEG_LIBRARY AND JPEG_INCLUDE_DIR)
   # in cache already
   SET(JPEG_FIND_QUIETLY TRUE)
-ENDIF(JPEG_LIBRARY AND JPEG_INCLUDE_DIR)
+ENDIF()
 
 
 FIND_PATH(JPEG_INCLUDE_DIR
@@ -42,9 +42,9 @@ IF(JPEG_LIBRARY AND JPEG_INCLUDE_DIR)
   SET(JPEG_FOUND "YES")
   IF(NOT JPEG_FIND_QUIETLY)
     MESSAGE(STATUS "Found Jpeg: ${JPEG_LIBRARY}")
-  ENDIF(NOT JPEG_FIND_QUIETLY)
+  ENDIF()
-ELSE(JPEG_LIBRARY AND JPEG_INCLUDE_DIR)
+ELSE()
   IF(NOT JPEG_FIND_QUIETLY)
     MESSAGE(STATUS "Warning: Unable to find Jpeg!")
-  ENDIF(NOT JPEG_FIND_QUIETLY)
+  ENDIF()
-ENDIF(JPEG_LIBRARY AND JPEG_INCLUDE_DIR)
+ENDIF()

code/CMakeModules/FindLibOVR.cmake

@@ -7,7 +7,7 @@
 IF(LIBOVR_LIBRARIES AND LIBOVR_INCLUDE_DIR)
   # in cache already
   SET(LIBOVR_FIND_QUIETLY TRUE)
-ENDIF(LIBOVR_LIBRARIES AND LIBOVR_INCLUDE_DIR)
+ENDIF()
 
 FIND_PATH(LIBOVR_INCLUDE_DIR
   OVR.h
@@ -24,18 +24,18 @@ FIND_PATH(LIBOVR_INCLUDE_DIR
 IF(UNIX)
   IF(TARGET_X64)
     SET(LIBOVR_LIBRARY_BUILD_PATH "Lib/Linux/Release/x86_64")
-  ELSE(TARGET_X64)
+  ELSE()
     SET(LIBOVR_LIBRARY_BUILD_PATH "Lib/Linux/Release/i386")
-  ENDIF(TARGET_X64)
+  ENDIF()
 ELSEIF(APPLE)
   SET(LIBOVR_LIBRARY_BUILD_PATH "Lib/MacOS/Release")
 ELSEIF(WIN32)
   IF(TARGET_X64)
     SET(LIBOVR_LIBRARY_BUILD_PATH "Lib/x64")
-  ELSE(TARGET_X64)
+  ELSE()
     SET(LIBOVR_LIBRARY_BUILD_PATH "Lib/Win32")
-  ENDIF(TARGET_X64)
+  ENDIF()
-ENDIF(UNIX)
+ENDIF()
 
 FIND_LIBRARY(LIBOVR_LIBRARY
   NAMES ovr libovr
@@ -55,17 +55,17 @@ FIND_LIBRARY(LIBOVR_LIBRARY
 IF(LIBOVR_LIBRARY AND LIBOVR_INCLUDE_DIR)
   IF(NOT LIBOVR_FIND_QUIETLY)
     MESSAGE(STATUS "Found LibOVR: ${LIBOVR_LIBRARY}")
-  ENDIF(NOT LIBOVR_FIND_QUIETLY)
+  ENDIF()
   SET(LIBOVR_FOUND "YES")
   SET(LIBOVR_DEFINITIONS "-DHAVE_LIBOVR")
   SET(NL_STEREO_AVAILABLE ON)
   IF(UNIX)
     SET(LIBOVR_LIBRARIES ${LIBOVR_LIBRARY} X11 Xinerama udev pthread)
-  ELSE(UNIX)
+  ELSE()
     SET(LIBOVR_LIBRARIES ${LIBOVR_LIBRARY})
-  ENDIF(UNIX)
+  ENDIF()
-ELSE(LIBOVR_LIBRARY AND LIBOVR_INCLUDE_DIR)
+ELSE()
   IF(NOT LIBOVR_FIND_QUIETLY)
     MESSAGE(STATUS "Warning: Unable to find LibOVR!")
-  ENDIF(NOT LIBOVR_FIND_QUIETLY)
+  ENDIF()
-ENDIF(LIBOVR_LIBRARY AND LIBOVR_INCLUDE_DIR)
+ENDIF()

code/CMakeModules/FindLibVR.cmake

@@ -7,7 +7,7 @@
 IF(LIBVR_LIBRARIES AND LIBVR_INCLUDE_DIR)
   # in cache already
   SET(LIBVR_FIND_QUIETLY TRUE)
-ENDIF(LIBVR_LIBRARIES AND LIBVR_INCLUDE_DIR)
+ENDIF()
 
 FIND_PATH(LIBVR_INCLUDE_DIR hmd.h
   PATH_SUFFIXES include/LibVR
@@ -22,12 +22,12 @@ FIND_LIBRARY(LIBVR_LIBRARY
 IF(LIBVR_LIBRARY AND LIBVR_INCLUDE_DIR)
   IF(NOT LIBVR_FIND_QUIETLY)
     MESSAGE(STATUS "Found LibVR: ${LIBVR_LIBRARY}")
-  ENDIF(NOT LIBVR_FIND_QUIETLY)
+  ENDIF()
   SET(LIBVR_FOUND "YES")
   SET(LIBVR_DEFINITIONS "-DHAVE_LIBVR")
   SET(NL_STEREO_AVAILABLE ON)
-ELSE(LIBVR_LIBRARY AND LIBVR_INCLUDE_DIR)
+ELSE()
   IF(NOT LIBVR_FIND_QUIETLY)
     MESSAGE(STATUS "Warning: Unable to find LibVR!")
-  ENDIF(NOT LIBVR_FIND_QUIETLY)
+  ENDIF()
-ENDIF(LIBVR_LIBRARY AND LIBVR_INCLUDE_DIR)
+ENDIF()

code/CMakeModules/FindLuabind.cmake

@@ -143,7 +143,7 @@ ENDIF()
 IF(WITH_STLPORT)
   LIST(APPEND LIBRARY_NAME_RELEASE luabind_stlport)
   LIST(APPEND LIBRARY_NAME_DEBUG luabind_stlportd)
-ENDIF(WITH_STLPORT)
+ENDIF()
 
 # generic libraries names
 LIST(APPEND LIBRARY_NAME_RELEASE luabind libluabind)
@@ -194,7 +194,7 @@ IF(LUABIND_INCLUDE_DIR AND Boost_INCLUDE_DIR)
     # Case where Luabind is compiled from sources (debug version is compiled by default)
     SET(LUABIND_FOUND TRUE)
     SET(LUABIND_LIBRARIES ${LUABIND_LIBRARY_DEBUG})
-  ENDIF(LUABIND_LIBRARY_RELEASE AND LUABIND_LIBRARY_DEBUG)
+  ENDIF()
 ENDIF()
 
 IF(LUABIND_FOUND)
@@ -209,11 +209,11 @@ IF(LUABIND_FOUND)
 
   IF(NOT Luabind_FIND_QUIETLY)
     MESSAGE(STATUS "Found Luabind: ${LUABIND_LIBRARIES}")
-  ENDIF(NOT Luabind_FIND_QUIETLY)
+  ENDIF()
 ELSE()
   IF(NOT Luabind_FIND_QUIETLY)
     MESSAGE(STATUS "Warning: Unable to find Luabind!")
   ENDIF()
-ENDIF(LUABIND_FOUND)
+ENDIF()
 
 MARK_AS_ADVANCED(LUABIND_LIBRARY_RELEASE LUABIND_LIBRARY_DEBUG Boost_LIB_DIAGNOSTIC_DEFINITIONS)

code/CMakeModules/FindOgg.cmake

@@ -7,7 +7,7 @@
 IF(OGG_LIBRARY AND OGG_INCLUDE_DIR)
   # in cache already
   SET(OGG_FIND_QUIETLY TRUE)
-ENDIF(OGG_LIBRARY AND OGG_INCLUDE_DIR)
+ENDIF()
 
 
 FIND_PATH(OGG_INCLUDE_DIR
@@ -41,9 +41,9 @@ IF(OGG_LIBRARY AND OGG_INCLUDE_DIR)
   SET(OGG_FOUND "YES")
   IF(NOT OGG_FIND_QUIETLY)
     MESSAGE(STATUS "Found Ogg: ${OGG_LIBRARY}")
-  ENDIF(NOT OGG_FIND_QUIETLY)
+  ENDIF()
-ELSE(OGG_LIBRARY AND OGG_INCLUDE_DIR)
+ELSE()
   IF(NOT OGG_FIND_QUIETLY)
     MESSAGE(STATUS "Warning: Unable to find Ogg!")
-  ENDIF(NOT OGG_FIND_QUIETLY)
+  ENDIF()
-ENDIF(OGG_LIBRARY AND OGG_INCLUDE_DIR)
+ENDIF()

code/CMakeModules/FindOpenGLES.cmake

@@ -43,7 +43,7 @@ IF(OPENGLES_GLES_LIBRARY)
   IF(OPENGLES_EGL_LIBRARY)
     SET(OPENGLES_EGL_FOUND "YES")
     SET(OPENGLES_LIBRARIES ${OPENGLES_EGL_LIBRARY} ${OPENGLES_LIBRARIES})
-  ELSE(OPENGLES_EGL_LIBRARY)
+  ELSE()
     SET(OPENGLES_EGL_FOUND "NO")
-  ENDIF(OPENGLES_EGL_LIBRARY)
+  ENDIF()
-ENDIF(OPENGLES_GLES_LIBRARY)
+ENDIF()

code/CMakeModules/FindSTLport.cmake

@@ -9,7 +9,7 @@
 IF(STLPORT_LIBRARIES AND STLPORT_INCLUDE_DIR)
   # in cache already
   SET(STLPORT_FIND_QUIETLY TRUE)
-ENDIF(STLPORT_LIBRARIES AND STLPORT_INCLUDE_DIR)
+ENDIF()
 
 FIND_PATH(STLPORT_INCLUDE_DIR 
   iostream
@@ -74,18 +74,18 @@ IF(STLPORT_INCLUDE_DIR)
     SET(STLPORT_LIBRARIES ${STLPORT_LIBRARY_RELEASE})
     IF(STLPORT_LIBRARY_DEBUG)
       SET(STLPORT_LIBRARIES optimized ${STLPORT_LIBRARIES} debug ${STLPORT_LIBRARY_DEBUG})
-    ENDIF(STLPORT_LIBRARY_DEBUG)
+    ENDIF()
-  ENDIF(STLPORT_LIBRARY_RELEASE)
+  ENDIF()
-ENDIF(STLPORT_INCLUDE_DIR)
+ENDIF()
 
 IF(STLPORT_FOUND)
   IF(NOT STLPORT_FIND_QUIETLY)
     MESSAGE(STATUS "Found STLport: ${STLPORT_LIBRARIES}")
-  ENDIF(NOT STLPORT_FIND_QUIETLY)
+  ENDIF()
-ELSE(STLPORT_FOUND)
+ELSE()
   IF(NOT STLPORT_FIND_QUIETLY)
     MESSAGE(STATUS "Warning: Unable to find STLport!")
-  ENDIF(NOT STLPORT_FIND_QUIETLY)
+  ENDIF()
-ENDIF(STLPORT_FOUND)
+ENDIF()
 
 MARK_AS_ADVANCED(STLPORT_LIBRARY_RELEASE STLPORT_LIBRARY_DEBUG)

code/CMakeModules/FindSquish.cmake

@@ -10,7 +10,7 @@
 IF(SQUISH_LIBRARIES AND SQUISH_INCLUDE_DIR)
   # in cache already
   SET(SQUISH_FIND_QUIETLY TRUE)
-ENDIF(SQUISH_LIBRARIES AND SQUISH_INCLUDE_DIR)
+ENDIF()
 
 FIND_PATH(SQUISH_INCLUDE_DIR
   squish.h
@@ -58,26 +58,26 @@ IF(SQUISH_INCLUDE_DIR)
     SET(SQUISH_LIBRARIES "optimized;${SQUISH_LIBRARY_RELEASE}")
     IF(SQUISH_LIBRARY_DEBUG)
       SET(SQUISH_LIBRARIES "${SQUISH_LIBRARIES};debug;${SQUISH_LIBRARY_DEBUG}")
-    ELSE(SQUISH_LIBRARY_DEBUG)
+    ELSE()
       SET(SQUISH_LIBRARIES "${SQUISH_LIBRARIES};debug;${SQUISH_LIBRARY_RELEASE}")
       MESSAGE("Debug Squish NOT found, using the release version!")
-    ENDIF(SQUISH_LIBRARY_DEBUG)
+    ENDIF()
-  ENDIF(SQUISH_LIBRARY_RELEASE)
+  ENDIF()
-ENDIF(SQUISH_INCLUDE_DIR)
+ENDIF()
 
 IF(SQUISH_FOUND)
   IF(NOT SQUISH_FIND_QUIETLY)
     MESSAGE(STATUS "Found Squish: ${SQUISH_LIBRARIES}")
-  ENDIF(NOT SQUISH_FIND_QUIETLY)
+  ENDIF()
   FILE(STRINGS ${SQUISH_INCLUDE_DIR}/squish.h METRIC REGEX "metric = 0")
   IF(METRIC)
     SET(SQUISH_COMPRESS_HAS_METRIC ON)
     SET(SQUISH_DEFINITIONS -DSQUISH_COMPRESS_HAS_METRIC)
-  ENDIF(METRIC)
+  ENDIF()
-ELSE(SQUISH_FOUND)
+ELSE()
   IF(NOT SQUISH_FIND_QUIETLY)
     MESSAGE(STATUS "Warning: Unable to find Squish!")
-  ENDIF(NOT SQUISH_FIND_QUIETLY)
+  ENDIF()
-ENDIF(SQUISH_FOUND)
+ENDIF()
 
 MARK_AS_ADVANCED(SQUISH_LIBRARY_RELEASE SQUISH_LIBRARY_DEBUG)

code/CMakeModules/FindVorbis.cmake

@@ -7,7 +7,7 @@
 IF(VORBIS_LIBRARY AND VORBIS_INCLUDE_DIR)
   # in cache already
   SET(VORBIS_FIND_QUIETLY TRUE)
-ENDIF(VORBIS_LIBRARY AND VORBIS_INCLUDE_DIR)
+ENDIF()
 
 
 FIND_PATH(VORBIS_INCLUDE_DIR
@@ -57,9 +57,9 @@ IF(VORBIS_LIBRARY AND VORBISFILE_LIBRARY AND VORBIS_INCLUDE_DIR)
   SET(VORBIS_LIBRARIES ${VORBIS_LIBRARY} ${VORBISFILE_LIBRARY})
   IF(NOT VORBIS_FIND_QUIETLY)
     MESSAGE(STATUS "Found Vorbis: ${VORBIS_LIBRARY}")
-  ENDIF(NOT VORBIS_FIND_QUIETLY)
+  ENDIF()
-ELSE(VORBIS_LIBRARY AND VORBISFILE_LIBRARY AND VORBIS_INCLUDE_DIR)
+ELSE()
   IF(NOT VORBIS_FIND_QUIETLY)
     MESSAGE(STATUS "Warning: Unable to find Vorbis!")
-  ENDIF(NOT VORBIS_FIND_QUIETLY)
+  ENDIF()
-ENDIF(VORBIS_LIBRARY AND VORBISFILE_LIBRARY AND VORBIS_INCLUDE_DIR)
+ENDIF()

code/CMakeModules/FindXF86VidMode.cmake

@@ -7,7 +7,7 @@
 IF(XF86VidMode_LIBRARY AND XF86VidMode_INCLUDE_DIR)
   # in cache already
   SET(XF86VidMode_FIND_QUIETLY TRUE)
-ENDIF(XF86VidMode_LIBRARY AND XF86VidMode_INCLUDE_DIR)
+ENDIF()
 
 
 FIND_PATH(XF86VidMode_INCLUDE_DIR
@@ -37,10 +37,10 @@ IF(XF86VidMode_LIBRARY AND XF86VidMode_INCLUDE_DIR)
   SET(XF86VidMode_DEFINITIONS -DXF86VIDMODE)
   IF(NOT XF86VidMode_FIND_QUIETLY)
     MESSAGE(STATUS "Found XF86VidMode: ${XF86VidMode_LIBRARY}")
-  ENDIF(NOT XF86VidMode_FIND_QUIETLY)
+  ENDIF()
-ELSE(XF86VidMode_LIBRARY AND XF86VidMode_INCLUDE_DIR)
+ELSE()
   IF(NOT XF86VidMode_FIND_QUIETLY)
     MESSAGE(STATUS "Warning: Unable to find XF86VidMode!")
-  ENDIF(NOT XF86VidMode_FIND_QUIETLY)
+  ENDIF()
-ENDIF(XF86VidMode_LIBRARY AND XF86VidMode_INCLUDE_DIR)
+ENDIF()
 

code/CMakeModules/PCHSupport.cmake

@@ -259,16 +259,16 @@ MACRO(GET_PDB_FILENAME _out_filename _target)
     SET(_targetOutput ${CMAKE_RUNTIME_OUTPUT_DIRECTORY})
   ELSEIF(${_targetType} STREQUAL STATIC_LIBRARY)
     SET(_targetOutput ${CMAKE_ARCHIVE_OUTPUT_DIRECTORY})
-  ELSE(${_targetType} STREQUAL EXECUTABLE)
+  ELSE()
     SET(_targetOutput ${CMAKE_LIBRARY_OUTPUT_DIRECTORY})
-  ENDIF(${_targetType} STREQUAL EXECUTABLE)
+  ENDIF()
 
   # determine target postfix
   STRING(TOUPPER "${CMAKE_BUILD_TYPE}_POSTFIX" _postfix_var_name)
   GET_TARGET_PROPERTY(_targetPostfix ${_target} ${_postfix_var_name})
   IF(${_targetPostfix} MATCHES NOTFOUND)
     SET(_targetPostfix "")
-  ENDIF(${_targetPostfix} MATCHES NOTFOUND)
+  ENDIF()
 
   SET(${_out_filename} "${_targetOutput}/${_target}${_targetPostfix}.pdb")
 ENDMACRO(GET_PDB_FILENAME)

code/CMakeModules/nel.cmake

@@ -4,7 +4,7 @@ SET(CMAKE_TRY_COMPILE_CONFIGURATION "Release")
 # Force Release configuration by default
 IF(NOT CMAKE_BUILD_TYPE)
   SET(CMAKE_BUILD_TYPE "Release" CACHE STRING "" FORCE)
-ENDIF(NOT CMAKE_BUILD_TYPE)
+ENDIF()
 
 # Declare CMAKE_CONFIGURATION_TYPES before PROJECT
 SET(CMAKE_CONFIGURATION_TYPES "Debug;Release" CACHE STRING "" FORCE)
@@ -17,7 +17,7 @@ MACRO(NL_GEN_PC name)
   IF(NOT WIN32 AND WITH_INSTALL_LIBRARIES)
     CONFIGURE_FILE(${name}.in "${CMAKE_CURRENT_BINARY_DIR}/${name}")
     INSTALL(FILES "${CMAKE_CURRENT_BINARY_DIR}/${name}" DESTINATION ${NL_LIB_PREFIX}/pkgconfig)
-  ENDIF(NOT WIN32 AND WITH_INSTALL_LIBRARIES)
+  ENDIF()
 ENDMACRO(NL_GEN_PC)
 
 ###
@@ -26,9 +26,9 @@ ENDMACRO(NL_GEN_PC)
 MACRO(NL_TARGET_LIB name)
   IF(WITH_STATIC)
     ADD_LIBRARY(${name} STATIC ${ARGN})
-  ELSE(WITH_STATIC)
+  ELSE()
     ADD_LIBRARY(${name} SHARED ${ARGN})
-  ENDIF(WITH_STATIC)
+  ENDIF()
 ENDMACRO(NL_TARGET_LIB)
 
 ###
@@ -37,9 +37,9 @@ ENDMACRO(NL_TARGET_LIB)
 MACRO(NL_TARGET_DRIVER name)
   IF(WITH_STATIC_DRIVERS)
     ADD_LIBRARY(${name} STATIC ${ARGN})
-  ELSE(WITH_STATIC_DRIVERS)
+  ELSE()
     ADD_LIBRARY(${name} MODULE ${ARGN})
-  ENDIF(WITH_STATIC_DRIVERS)
+  ENDIF()
 ENDMACRO(NL_TARGET_DRIVER)
 
 ###
@@ -64,8 +64,8 @@ MACRO(NL_DEFAULT_PROPS name label)
       VERSION ${NL_VERSION} SOVERSION ${NL_VERSION_MAJOR})
     IF(NL_LIB_PREFIX)
       SET_TARGET_PROPERTIES(${name} PROPERTIES INSTALL_NAME_DIR ${NL_LIB_PREFIX})
-    ENDIF(NL_LIB_PREFIX)
+    ENDIF()
-  ENDIF(${type} STREQUAL SHARED_LIBRARY)
+  ENDIF()
 
   IF(${type} STREQUAL EXECUTABLE AND WIN32 AND NOT MINGW)
     # check if using a GUI
@@ -92,7 +92,7 @@ MACRO(NL_DEFAULT_PROPS name label)
       SOVERSION ${NL_VERSION_MAJOR}
       COMPILE_FLAGS "/GA"
       LINK_FLAGS "/VERSION:${NL_VERSION_MAJOR}.${NL_VERSION_MINOR} /SUBSYSTEM:${_SUBSYSTEM},${_SUBSYSTEM_VERSION}")
-  ENDIF(${type} STREQUAL EXECUTABLE AND WIN32 AND NOT MINGW)
+  ENDIF()
 ENDMACRO(NL_DEFAULT_PROPS)
 
 ###
@@ -102,7 +102,7 @@ ENDMACRO(NL_DEFAULT_PROPS)
 MACRO(NL_ADD_LIB_SUFFIX name)
   IF(WIN32)
     SET_TARGET_PROPERTIES(${name} PROPERTIES DEBUG_POSTFIX "_d" RELEASE_POSTFIX "_r")
-  ENDIF(WIN32)
+  ENDIF()
 ENDMACRO(NL_ADD_LIB_SUFFIX)
 
 ###
@@ -114,10 +114,10 @@ MACRO(NL_ADD_RUNTIME_FLAGS name)
 #    SET_TARGET_PROPERTIES(${name} PROPERTIES
 #      LINK_FLAGS_DEBUG "${CMAKE_LINK_FLAGS_DEBUG}"
 #      LINK_FLAGS_RELEASE "${CMAKE_LINK_FLAGS_RELEASE}")
-  ENDIF(WIN32)
+  ENDIF()
   IF(WITH_STLPORT)
     TARGET_LINK_LIBRARIES(${name} ${STLPORT_LIBRARIES} ${CMAKE_THREAD_LIBS_INIT})
-  ENDIF(WITH_STLPORT)
+  ENDIF()
 ENDMACRO(NL_ADD_RUNTIME_FLAGS)
 
 MACRO(NL_ADD_STATIC_VID_DRIVERS name)
@@ -125,25 +125,25 @@ MACRO(NL_ADD_STATIC_VID_DRIVERS name)
     IF(WIN32)
       IF(WITH_DRIVER_DIRECT3D)
         TARGET_LINK_LIBRARIES(${name} nel_drv_direct3d_win)
-      ENDIF(WITH_DRIVER_DIRECT3D)
+      ENDIF()
-    ENDIF(WIN32)
+    ENDIF()
 
     IF(WITH_DRIVER_OPENGL)
       IF(WIN32)
         TARGET_LINK_LIBRARIES(${name} nel_drv_opengl_win)
-      ELSE(WIN32)
+      ELSE()
         TARGET_LINK_LIBRARIES(${name} nel_drv_opengl)
-      ENDIF(WIN32)
+      ENDIF()
-    ENDIF(WITH_DRIVER_OPENGL)
+    ENDIF()
 
     IF(WITH_DRIVER_OPENGLES)
       IF(WIN32)
         TARGET_LINK_LIBRARIES(${name} nel_drv_opengles_win)
-      ELSE(WIN32)
+      ELSE()
         TARGET_LINK_LIBRARIES(${name} nel_drv_opengles)
-      ENDIF(WIN32)
+      ENDIF()
-    ENDIF(WITH_DRIVER_OPENGLES)
+    ENDIF()
-  ENDIF(WITH_STATIC_DRIVERS)
+  ENDIF()
 ENDMACRO(NL_ADD_STATIC_VID_DRIVERS)
 
 MACRO(NL_ADD_STATIC_SND_DRIVERS name)
@@ -151,30 +151,30 @@ MACRO(NL_ADD_STATIC_SND_DRIVERS name)
     IF(WIN32)
       IF(WITH_DRIVER_DSOUND)
         TARGET_LINK_LIBRARIES(${name} nel_drv_dsound_win)
-      ENDIF(WITH_DRIVER_DSOUND)
+      ENDIF()
 
       IF(WITH_DRIVER_XAUDIO2)
         TARGET_LINK_LIBRARIES(${name} nel_drv_xaudio2_win)
-      ENDIF(WITH_DRIVER_XAUDIO2)
+      ENDIF()
 
       IF(WITH_DRIVER_OPENAL)
         TARGET_LINK_LIBRARIES(${name} nel_drv_openal_win)
-      ENDIF(WITH_DRIVER_OPENAL)
+      ENDIF()
 
       IF(WITH_DRIVER_FMOD)
         TARGET_LINK_LIBRARIES(${name} nel_drv_fmod_win)
-      ENDIF(WITH_DRIVER_FMOD)
+      ENDIF()
-    ELSE(WIN32)
+    ELSE()
       IF(WITH_DRIVER_OPENAL)
         TARGET_LINK_LIBRARIES(${name} nel_drv_openal)
-      ENDIF(WITH_DRIVER_OPENAL)
+      ENDIF()
 
       IF(WITH_DRIVER_FMOD)
         TARGET_LINK_LIBRARIES(${name} nel_drv_fmod)
-      ENDIF(WITH_DRIVER_FMOD)
+      ENDIF()
-    ENDIF(WIN32)
+    ENDIF()
 
-  ENDIF(WITH_STATIC_DRIVERS)
+  ENDIF()
 ENDMACRO(NL_ADD_STATIC_SND_DRIVERS)
 
 ###
@@ -192,14 +192,14 @@ Remove the CMakeCache.txt file and try again from another folder, e.g.:
    cd cmake
    cmake ..
     ")
-  ENDIF(${CMAKE_SOURCE_DIR} STREQUAL ${CMAKE_BINARY_DIR})
+  ENDIF()
 
 ENDMACRO(CHECK_OUT_OF_SOURCE)
 
 MACRO(NL_SETUP_DEFAULT_OPTIONS)
   IF(WITH_QT)
     OPTION(WITH_STUDIO              "Build Core Studio"                             OFF )
-  ENDIF(WITH_QT)
+  ENDIF()
 
   ###
   # Features
@@ -213,30 +213,30 @@ MACRO(NL_SETUP_DEFAULT_OPTIONS)
   # Default to static building on Windows.
   IF(WIN32)
     OPTION(WITH_STATIC            "With static libraries."                        ON )
-  ELSE(WIN32)
+  ELSE()
     OPTION(WITH_STATIC            "With static libraries."                        OFF)
-  ENDIF(WIN32)
+  ENDIF()
   IF (WITH_STATIC)
     OPTION(WITH_STATIC_LIBXML2    "With static libxml2"                           ON )
-  ELSE(WITH_STATIC)
+  ELSE()
     OPTION(WITH_STATIC_LIBXML2    "With static libxml2"                           OFF)
-  ENDIF(WITH_STATIC)
+  ENDIF()
   IF (WITH_STATIC)
     OPTION(WITH_STATIC_CURL       "With static curl"                              ON )
-  ELSE(WITH_STATIC)
+  ELSE()
     OPTION(WITH_STATIC_CURL       "With static curl"                              OFF)
-  ENDIF(WITH_STATIC)
+  ENDIF()
   IF(APPLE)
     OPTION(WITH_LIBXML2_ICONV     "With libxml2 using iconv"                      ON )
-  ELSE(APPLE)
+  ELSE()
     OPTION(WITH_LIBXML2_ICONV     "With libxml2 using iconv"                      OFF)
-  ENDIF(APPLE)
+  ENDIF()
   OPTION(WITH_STATIC_DRIVERS      "With static drivers."                          OFF)
   IF(WIN32)
     OPTION(WITH_EXTERNAL          "With provided external."                       ON )
-  ELSE(WIN32)
+  ELSE()
     OPTION(WITH_EXTERNAL          "With provided external."                       OFF)
-  ENDIF(WIN32)
+  ENDIF()
   OPTION(WITH_STATIC_EXTERNAL     "With static external libraries"                OFF)
   IF(UNIX AND NOT APPLE)
     OPTION(WITH_UNIX_STRUCTURE    "Use UNIX structure (bin, include, lib)"        ON )
@@ -256,9 +256,9 @@ MACRO(NL_SETUP_DEFAULT_OPTIONS)
 
   IF(WIN32 AND MFC_FOUND)
     OPTION(WITH_MFC               "With MFC Support"                              ON )
-  ELSE(WIN32 AND MFC_FOUND)
+  ELSE()
     OPTION(WITH_MFC               "With MFC Support"                              OFF)
-  ENDIF(WIN32 AND MFC_FOUND)
+  ENDIF()
 
   ###
   # Optional support
@@ -323,7 +323,7 @@ MACRO(NL_SETUP_NEL_DEFAULT_OPTIONS)
 
   IF(NOT MSVC)
     OPTION(WITH_GCC_FPMATH_BOTH   "With GCC -mfpmath=both"                        OFF)
-  ENDIF(NOT MSVC)
+  ENDIF()
 ENDMACRO(NL_SETUP_NEL_DEFAULT_OPTIONS)
 
 MACRO(NL_SETUP_NELNS_DEFAULT_OPTIONS)
@@ -380,15 +380,15 @@ MACRO(NL_SETUP_BUILD)
 
   IF(CMAKE_BUILD_TYPE MATCHES "Debug")
     SET(NL_BUILD_MODE "NL_DEBUG")
-  ELSE(CMAKE_BUILD_TYPE MATCHES "Debug")
+  ELSE()
     IF(CMAKE_BUILD_TYPE MATCHES "Release")
       SET(NL_BUILD_MODE "NL_RELEASE")
-    ELSE(CMAKE_BUILD_TYPE MATCHES "Release")
+    ELSE()
       SET(NL_BUILD_MODE "NL_RELEASE")
       # enforce release mode if it's neither Debug nor Release
       SET(CMAKE_BUILD_TYPE "Release" CACHE STRING "" FORCE)
-    ENDIF(CMAKE_BUILD_TYPE MATCHES "Release")
+    ENDIF()
-  ENDIF(CMAKE_BUILD_TYPE MATCHES "Debug")
+  ENDIF()
 
   SET(HOST_CPU ${CMAKE_HOST_SYSTEM_PROCESSOR})
 
@@ -396,35 +396,35 @@ MACRO(NL_SETUP_BUILD)
     SET(HOST_CPU "x86_64")
   ELSEIF(HOST_CPU MATCHES "i.86")
     SET(HOST_CPU "x86")
-  ENDIF(HOST_CPU MATCHES "(amd|AMD)64")
+  ENDIF()
 
   # Determine target CPU
 
   # If not specified, use the same CPU as host
   IF(NOT TARGET_CPU)
     SET(TARGET_CPU ${CMAKE_SYSTEM_PROCESSOR})
-  ENDIF(NOT TARGET_CPU)
+  ENDIF()
 
   IF(TARGET_CPU MATCHES "(amd|AMD)64")
     SET(TARGET_CPU "x86_64")
   ELSEIF(TARGET_CPU MATCHES "i.86")
     SET(TARGET_CPU "x86")
-  ENDIF(TARGET_CPU MATCHES "(amd|AMD)64")
+  ENDIF()
 
   IF(${CMAKE_CXX_COMPILER_ID} MATCHES "Clang")
     SET(CLANG ON)
     MESSAGE(STATUS "Using Clang compiler")
-  ENDIF(${CMAKE_CXX_COMPILER_ID} MATCHES "Clang")
+  ENDIF()
 
   IF(CMAKE_GENERATOR MATCHES "Xcode")
     SET(XCODE ON)
     MESSAGE(STATUS "Generating Xcode project")
-  ENDIF(CMAKE_GENERATOR MATCHES "Xcode")
+  ENDIF()
 
   IF(CMAKE_GENERATOR MATCHES "NMake")
     SET(NMAKE ON)
     MESSAGE(STATUS "Generating NMake project")
-  ENDIF(CMAKE_GENERATOR MATCHES "NMake")
+  ENDIF()
 
   # If target and host CPU are the same
   IF("${HOST_CPU}" STREQUAL "${TARGET_CPU}" AND NOT CMAKE_CROSSCOMPILING)
@@ -433,24 +433,24 @@ MACRO(NL_SETUP_BUILD)
       IF(NOT CMAKE_SIZEOF_VOID_P)
         INCLUDE (CheckTypeSize)
         CHECK_TYPE_SIZE("void*"  CMAKE_SIZEOF_VOID_P)
-      ENDIF(NOT CMAKE_SIZEOF_VOID_P)
+      ENDIF()
 
       # Using 32 or 64 bits libraries
       IF(CMAKE_SIZEOF_VOID_P EQUAL 8)
         SET(TARGET_CPU "x86_64")
-      ELSE(CMAKE_SIZEOF_VOID_P EQUAL 8)
+      ELSE()
         SET(TARGET_CPU "x86")
-      ENDIF(CMAKE_SIZEOF_VOID_P EQUAL 8)
+      ENDIF()
     ELSEIF(HOST_CPU MATCHES "arm")
       SET(TARGET_CPU "arm")
-    ELSE(HOST_CPU MATCHES "x86")
+    ELSE()
       SET(TARGET_CPU "unknown")
       MESSAGE(STATUS "Unknown architecture: ${HOST_CPU}")
-    ENDIF(HOST_CPU MATCHES "x86")
+    ENDIF()
     # TODO: add checks for PPC
-  ELSE("${HOST_CPU}" STREQUAL "${TARGET_CPU}" AND NOT CMAKE_CROSSCOMPILING)
+  ELSE()
     MESSAGE(STATUS "Compiling on ${HOST_CPU} for ${TARGET_CPU}")
-  ENDIF("${HOST_CPU}" STREQUAL "${TARGET_CPU}" AND NOT CMAKE_CROSSCOMPILING)
+  ENDIF()
 
   # Use values from environment variables
   SET(PLATFORM_CFLAGS "$ENV{CFLAGS} $ENV{CPPFLAGS} ${PLATFORM_CFLAGS}")
@@ -490,36 +490,36 @@ MACRO(NL_SETUP_BUILD)
       SET(TARGET_ARM 1)
     ELSEIF(TARGET_CPU STREQUAL "mips")
       SET(TARGET_MIPS 1)
-    ENDIF(TARGET_CPU STREQUAL "x86_64")
+    ENDIF()
 
     IF(TARGET_ARM)
       IF(TARGET_ARMV7S)
         ADD_PLATFORM_FLAGS("-DHAVE_ARMV7S")
-      ENDIF(TARGET_ARMV7S)
+      ENDIF()
 
       IF(TARGET_ARMV7)
         ADD_PLATFORM_FLAGS("-DHAVE_ARMV7")
-      ENDIF(TARGET_ARMV7)
+      ENDIF()
 
       IF(TARGET_ARMV6)
         ADD_PLATFORM_FLAGS("-HAVE_ARMV6")
-      ENDIF(TARGET_ARMV6)
+      ENDIF()
 
       ADD_PLATFORM_FLAGS("-DHAVE_ARM")
-    ENDIF(TARGET_ARM)
+    ENDIF()
 
     IF(TARGET_X86)
       ADD_PLATFORM_FLAGS("-DHAVE_X86")
-    ENDIF(TARGET_X86)
+    ENDIF()
 
     IF(TARGET_X64)
       ADD_PLATFORM_FLAGS("-DHAVE_X64 -DHAVE_X86_64")
-    ENDIF(TARGET_X64)
+    ENDIF()
 
     IF(TARGET_MIPS)
       ADD_PLATFORM_FLAGS("-DHAVE_MIPS")
-    ENDIF(TARGET_MIPS)
+    ENDIF()
-  ENDIF(NOT CMAKE_OSX_ARCHITECTURES)
+  ENDIF()
 
   # Fix library paths suffixes for Debian MultiArch
   IF(LIBRARY_ARCHITECTURE)
@@ -528,22 +528,22 @@ MACRO(NL_SETUP_BUILD)
       SET(CMAKE_LIBRARY_PATH ${CMAKE_LIBRARY_PATH} /lib64 /usr/lib64)
     ELSEIF(TARGET_X86)
       SET(CMAKE_LIBRARY_PATH ${CMAKE_LIBRARY_PATH} /lib32 /usr/lib32)
-    ENDIF(TARGET_X64)
+    ENDIF()
-  ENDIF(LIBRARY_ARCHITECTURE)
+  ENDIF()
 
   IF(APPLE AND NOT IOS)
     SET(CMAKE_INCLUDE_PATH /opt/local/include ${CMAKE_INCLUDE_PATH})
     SET(CMAKE_LIBRARY_PATH /opt/local/lib ${CMAKE_LIBRARY_PATH})
-  ENDIF(APPLE AND NOT IOS)
+  ENDIF()
 
   IF(WITH_LOGGING)
     ADD_PLATFORM_FLAGS("-DENABLE_LOGS")
-  ENDIF(WITH_LOGGING)
+  ENDIF()
 
   IF(MSVC)
     IF(MSVC_VERSION EQUAL "1700" AND NOT MSVC11)
       SET(MSVC11 ON)
-    ENDIF(MSVC_VERSION EQUAL "1700" AND NOT MSVC11)
+    ENDIF()
 
     # Ignore default include paths
     ADD_PLATFORM_FLAGS("/X")
@@ -584,9 +584,9 @@ MACRO(NL_SETUP_BUILD)
       SET(RELEASE_CFLAGS "/Ox /GF /GS- ${RELEASE_CFLAGS}")
       # without inlining it's unusable, use custom optimizations again
       SET(DEBUG_CFLAGS "/Od /Ob1 ${DEBUG_CFLAGS}")
-    ELSE(MSVC12)
+    ELSE()
       MESSAGE(FATAL_ERROR "Can't determine compiler version ${MSVC_VERSION}")
-    ENDIF(MSVC14)
+    ENDIF()
 
     ADD_PLATFORM_FLAGS("/D_CRT_SECURE_NO_DEPRECATE /D_CRT_SECURE_NO_WARNINGS /D_CRT_NONSTDC_NO_WARNINGS /DWIN32 /D_WINDOWS /wd4250")
 
@@ -595,10 +595,10 @@ MACRO(NL_SETUP_BUILD)
       ADD_PLATFORM_FLAGS("/D_WIN64")
       # Fix a compilation error for some big C++ files
       SET(RELEASE_CFLAGS "${RELEASE_CFLAGS} /bigobj")
-    ELSE(TARGET_X64)
+    ELSE()
       # Allows 32 bits applications to use 3 GB of RAM
       SET(PLATFORM_LINKFLAGS "${PLATFORM_LINKFLAGS} /LARGEADDRESSAWARE")
-    ENDIF(TARGET_X64)
+    ENDIF()
 
     # Exceptions are only set for C++
     SET(PLATFORM_CXXFLAGS "${PLATFORM_CXXFLAGS} /EHa")
@@ -606,9 +606,9 @@ MACRO(NL_SETUP_BUILD)
     IF(WITH_SYMBOLS)
       SET(NL_RELEASE_CFLAGS "/Zi ${NL_RELEASE_CFLAGS}")
       SET(NL_RELEASE_LINKFLAGS "/DEBUG ${NL_RELEASE_LINKFLAGS}")
-    ELSE(WITH_SYMBOLS)
+    ELSE()
       SET(NL_RELEASE_LINKFLAGS "/RELEASE ${NL_RELEASE_LINKFLAGS}")
-    ENDIF(WITH_SYMBOLS)
+    ENDIF()
 
     SET(NL_DEBUG_CFLAGS "/Zi /MDd /RTC1 /D_DEBUG ${DEBUG_CFLAGS} ${NL_DEBUG_CFLAGS}")
     SET(NL_RELEASE_CFLAGS "/MD /DNDEBUG ${RELEASE_CFLAGS} ${NL_RELEASE_CFLAGS}")
@@ -617,25 +617,25 @@ MACRO(NL_SETUP_BUILD)
 
     IF(WITH_WARNINGS)
       SET(DEBUG_CFLAGS "/W4 ${DEBUG_CFLAGS}")
-    ELSE(WITH_WARNINGS)
+    ELSE()
       SET(DEBUG_CFLAGS "/W3 ${DEBUG_CFLAGS}")
-    ENDIF(WITH_WARNINGS)
+    ENDIF()
-  ELSE(MSVC)
+  ELSE()
     IF(WIN32)
       ADD_PLATFORM_FLAGS("-DWIN32 -D_WIN32")
 
       IF(CLANG)
         ADD_PLATFORM_FLAGS("-nobuiltininc")
-      ENDIF(CLANG)
+      ENDIF()
-    ENDIF(WIN32)
+    ENDIF()
 
     IF(WITH_SSE3)
       ADD_PLATFORM_FLAGS("-msse3")
-    ENDIF(WITH_SSE3)
+    ENDIF()
 
     IF(WITH_GCC_FPMATH_BOTH)
       ADD_PLATFORM_FLAGS("-mfpmath=both")
-    ENDIF(WITH_GCC_FPMATH_BOTH)
+    ENDIF()
 
     IF(APPLE)
       IF(NOT XCODE)
@@ -670,97 +670,97 @@ MACRO(NL_SETUP_BUILD)
               SET(_ARCHS "${_ARCHS} mips")
               SET(TARGET_MIPS 1)
               MATH(EXPR TARGETS_COUNT "${TARGETS_COUNT}+1")
-            ELSE(_ARCH STREQUAL "i386")
+            ELSE()
               SET(_ARCHS "${_ARCHS} unknwon(${_ARCH})")
-            ENDIF(_ARCH STREQUAL "i386")
+            ENDIF()
           ENDFOREACH(_ARCH)
           MESSAGE(STATUS "Compiling under Mac OS X for ${TARGETS_COUNT} architectures: ${_ARCHS}")
-        ELSE(CMAKE_OSX_ARCHITECTURES)
+        ELSE()
           SET(TARGETS_COUNT 0)
-        ENDIF(CMAKE_OSX_ARCHITECTURES)
+        ENDIF()
 
         IF(TARGETS_COUNT EQUAL 1)
           IF(TARGET_ARM)
             IF(TARGET_ARMV7S)
               ADD_PLATFORM_FLAGS("-arch armv7s -DHAVE_ARMV7S")
-            ENDIF(TARGET_ARMV7S)
+            ENDIF()
 
             IF(TARGET_ARMV7)
               ADD_PLATFORM_FLAGS("-arch armv7 -DHAVE_ARMV7")
-            ENDIF(TARGET_ARMV7)
+            ENDIF()
 
             IF(TARGET_ARMV6)
               ADD_PLATFORM_FLAGS("-arch armv6 -DHAVE_ARMV6")
-            ENDIF(TARGET_ARMV6)
+            ENDIF()
 
             IF(TARGET_ARMV5)
               ADD_PLATFORM_FLAGS("-arch armv5 -DHAVE_ARMV5")
-            ENDIF(TARGET_ARMV5)
+            ENDIF()
 
             ADD_PLATFORM_FLAGS("-mthumb -DHAVE_ARM")
-          ENDIF(TARGET_ARM)
+          ENDIF()
 
           IF(TARGET_X64)
             ADD_PLATFORM_FLAGS("-arch x86_64 -DHAVE_X64 -DHAVE_X86_64 -DHAVE_X86")
           ELSEIF(TARGET_X86)
             ADD_PLATFORM_FLAGS("-arch i386 -DHAVE_X86")
-          ENDIF(TARGET_X64)
+          ENDIF()
 
           IF(TARGET_MIPS)
             ADD_PLATFORM_FLAGS("-arch mips -DHAVE_MIPS")
-          ENDIF(TARGET_MIPS)
+          ENDIF()
         ELSEIF(TARGETS_COUNT EQUAL 0)
           # Not using CMAKE_OSX_ARCHITECTURES, HAVE_XXX already defined before
           IF(TARGET_ARM)
             IF(TARGET_ARMV7S)
               ADD_PLATFORM_FLAGS("-arch armv7s")
-            ENDIF(TARGET_ARMV7S)
+            ENDIF()
 
             IF(TARGET_ARMV7)
               ADD_PLATFORM_FLAGS("-arch armv7")
-            ENDIF(TARGET_ARMV7)
+            ENDIF()
 
             IF(TARGET_ARMV6)
               ADD_PLATFORM_FLAGS("-arch armv6")
-            ENDIF(TARGET_ARMV6)
+            ENDIF()
 
             IF(TARGET_ARMV5)
               ADD_PLATFORM_FLAGS("-arch armv5")
-            ENDIF(TARGET_ARMV5)
+            ENDIF()
 
             ADD_PLATFORM_FLAGS("-mthumb")
-          ENDIF(TARGET_ARM)
+          ENDIF()
 
           IF(TARGET_X64)
             ADD_PLATFORM_FLAGS("-arch x86_64")
           ELSEIF(TARGET_X86)
             ADD_PLATFORM_FLAGS("-arch i386")
-          ENDIF(TARGET_X64)
+          ENDIF()
 
           IF(TARGET_MIPS)
             ADD_PLATFORM_FLAGS("-arch mips")
-          ENDIF(TARGET_MIPS)
+          ENDIF()
-        ELSE(TARGETS_COUNT EQUAL 1)
+        ELSE()
           IF(TARGET_ARMV6)
             ADD_PLATFORM_FLAGS("-Xarch_armv6 -mthumb -Xarch_armv6 -DHAVE_ARM -Xarch_armv6 -DHAVE_ARMV6")
-          ENDIF(TARGET_ARMV6)
+          ENDIF()
 
           IF(TARGET_ARMV7)
             ADD_PLATFORM_FLAGS("-Xarch_armv7 -mthumb -Xarch_armv7 -DHAVE_ARM -Xarch_armv7 -DHAVE_ARMV7")
-          ENDIF(TARGET_ARMV7)
+          ENDIF()
 
           IF(TARGET_X86)
             ADD_PLATFORM_FLAGS("-Xarch_i386 -DHAVE_X86")
-          ENDIF(TARGET_X86)
+          ENDIF()
 
           IF(TARGET_X64)
             ADD_PLATFORM_FLAGS("-Xarch_x86_64 -DHAVE_X64 -Xarch_x86_64 -DHAVE_X86_64")
-          ENDIF(TARGET_X64)
+          ENDIF()
 
           IF(TARGET_MIPS)
             ADD_PLATFORM_FLAGS("-Xarch_mips -DHAVE_MIPS")
-          ENDIF(TARGET_MIPS)
+          ENDIF()
-        ENDIF(TARGETS_COUNT EQUAL 1)
+        ENDIF()
 
         IF(IOS)
           SET(CMAKE_OSX_SYSROOT "" CACHE PATH "" FORCE)
@@ -770,73 +770,73 @@ MACRO(NL_SETUP_BUILD)
             CONVERT_VERSION_NUMBER(${IOS_VERSION_MAJOR} ${IOS_VERSION_MINOR} ${IOS_VERSION_PATCH} IOS_VERSION_NUMBER)
 
             ADD_PLATFORM_FLAGS("-D__IPHONE_OS_VERSION_MIN_REQUIRED=${IOS_VERSION_NUMBER}")
-          ENDIF(IOS_VERSION)
+          ENDIF()
 
           IF(CMAKE_IOS_SYSROOT)
             IF(TARGET_ARMV7S)
               IF(TARGETS_COUNT GREATER 1)
                 SET(XARCH "-Xarch_armv7s ")
-              ENDIF(TARGETS_COUNT GREATER 1)
+              ENDIF()
 
               ADD_PLATFORM_FLAGS("${XARCH}-isysroot${CMAKE_IOS_SYSROOT}")
               ADD_PLATFORM_FLAGS("${XARCH}-miphoneos-version-min=${IOS_VERSION}")
               SET(PLATFORM_LINKFLAGS "${PLATFORM_LINKFLAGS} ${XARCH}-Wl,-iphoneos_version_min,${IOS_VERSION}")
-            ENDIF(TARGET_ARMV7S)
+            ENDIF()
 
             IF(TARGET_ARMV7)
               IF(TARGETS_COUNT GREATER 1)
                 SET(XARCH "-Xarch_armv7 ")
-              ENDIF(TARGETS_COUNT GREATER 1)
+              ENDIF()
 
               ADD_PLATFORM_FLAGS("${XARCH}-isysroot${CMAKE_IOS_SYSROOT}")
               ADD_PLATFORM_FLAGS("${XARCH}-miphoneos-version-min=${IOS_VERSION}")
               SET(PLATFORM_LINKFLAGS "${PLATFORM_LINKFLAGS} ${XARCH}-Wl,-iphoneos_version_min,${IOS_VERSION}")
-            ENDIF(TARGET_ARMV7)
+            ENDIF()
 
             IF(TARGET_ARMV6)
               IF(TARGETS_COUNT GREATER 1)
                 SET(XARCH "-Xarch_armv6 ")
-              ENDIF(TARGETS_COUNT GREATER 1)
+              ENDIF()
 
               ADD_PLATFORM_FLAGS("${XARCH}-isysroot${CMAKE_IOS_SYSROOT}")
               ADD_PLATFORM_FLAGS("${XARCH}-miphoneos-version-min=${IOS_VERSION}")
               SET(PLATFORM_LINKFLAGS "${PLATFORM_LINKFLAGS} ${XARCH}-Wl,-iphoneos_version_min,${IOS_VERSION}")
-            ENDIF(TARGET_ARMV6)
+            ENDIF()
-          ENDIF(CMAKE_IOS_SYSROOT)
+          ENDIF()
 
           IF(CMAKE_IOS_SIMULATOR_SYSROOT AND TARGET_X86)
             IF(TARGETS_COUNT GREATER 1)
               SET(XARCH "-Xarch_i386 ")
-            ENDIF(TARGETS_COUNT GREATER 1)
+            ENDIF()
 
             ADD_PLATFORM_FLAGS("${XARCH}-isysroot${CMAKE_IOS_SIMULATOR_SYSROOT}")
             ADD_PLATFORM_FLAGS("${XARCH}-mios-simulator-version-min=${IOS_VERSION}")
             IF(CMAKE_OSX_DEPLOYMENT_TARGET)
               SET(PLATFORM_LINKFLAGS "${PLATFORM_LINKFLAGS} ${XARCH}-Wl,-macosx_version_min,${CMAKE_OSX_DEPLOYMENT_TARGET}")
-            ENDIF(CMAKE_OSX_DEPLOYMENT_TARGET)
+            ENDIF()
-          ENDIF(CMAKE_IOS_SIMULATOR_SYSROOT AND TARGET_X86)
+          ENDIF()
-        ELSE(IOS)
+        ELSE()
           # Always force -mmacosx-version-min to override environement variable
           IF(CMAKE_OSX_DEPLOYMENT_TARGET)
             SET(PLATFORM_LINKFLAGS "${PLATFORM_LINKFLAGS} -Wl,-macosx_version_min,${CMAKE_OSX_DEPLOYMENT_TARGET}")
-          ENDIF(CMAKE_OSX_DEPLOYMENT_TARGET)
+          ENDIF()
-        ENDIF(IOS)
+        ENDIF()
 
         SET(PLATFORM_LINKFLAGS "${PLATFORM_LINKFLAGS} -Wl,-headerpad_max_install_names")
 
         IF(HAVE_FLAG_SEARCH_PATHS_FIRST)
           SET(PLATFORM_LINKFLAGS "${PLATFORM_LINKFLAGS} -Wl,-search_paths_first")
-        ENDIF(HAVE_FLAG_SEARCH_PATHS_FIRST)
+        ENDIF()
-      ENDIF(NOT XCODE)
+      ENDIF()
-    ELSE(APPLE)
+    ELSE()
       IF(HOST_CPU STREQUAL "x86_64" AND TARGET_CPU STREQUAL "x86")
         ADD_PLATFORM_FLAGS("-m32 -march=i686")
-      ENDIF(HOST_CPU STREQUAL "x86_64" AND TARGET_CPU STREQUAL "x86")
+      ENDIF()
 
       IF(HOST_CPU STREQUAL "x86" AND TARGET_CPU STREQUAL "x86_64")
         ADD_PLATFORM_FLAGS("-m64")
-      ENDIF(HOST_CPU STREQUAL "x86" AND TARGET_CPU STREQUAL "x86_64")
+      ENDIF()
-    ENDIF(APPLE)
+    ENDIF()
 
     ADD_PLATFORM_FLAGS("-D_REENTRANT -fno-strict-aliasing")
 
@@ -846,11 +846,11 @@ MACRO(NL_SETUP_BUILD)
 
     IF(WITH_COVERAGE)
       ADD_PLATFORM_FLAGS("-fprofile-arcs -ftest-coverage")
-    ENDIF(WITH_COVERAGE)
+    ENDIF()
 
     IF(WITH_WARNINGS)
       ADD_PLATFORM_FLAGS("-Wall -W -Wpointer-arith -Wsign-compare -Wno-deprecated-declarations -Wno-multichar -Wno-unused")
-    ENDIF(WITH_WARNINGS)
+    ENDIF()
 
     IF(ANDROID)
       ADD_PLATFORM_FLAGS("--sysroot=${PLATFORM_ROOT}")
@@ -867,17 +867,17 @@ MACRO(NL_SETUP_BUILD)
           SET(PLATFORM_LINKFLAGS "${PLATFORM_LINKFLAGS} -march=armv7-a -Wl,--fix-cortex-a8")
         ELSEIF(TARGET_ARMV5)
           ADD_PLATFORM_FLAGS("-march=armv5te -mtune=xscale -msoft-float")
-        ENDIF(TARGET_ARMV7)
+        ENDIF()
 
         SET(TARGET_THUMB ON)
         IF(TARGET_THUMB)
           ADD_PLATFORM_FLAGS("-mthumb -fno-strict-aliasing -finline-limit=64")
           SET(DEBUG_CFLAGS "${DEBUG_CFLAGS} -marm")
-        ELSE(TARGET_THUMB)
+        ELSE()
           ADD_PLATFORM_FLAGS("-funswitch-loops -finline-limit=300")
           SET(DEBUG_CFLAGS "${DEBUG_CFLAGS} -fno-strict-aliasing")
           SET(RELEASE_CFLAGS "${RELEASE_CFLAGS} -fstrict-aliasing")
-        ENDIF(TARGET_THUMB)
+        ENDIF()
       ELSEIF(TARGET_X86)
         # Optimizations for Intel Atom
         ADD_PLATFORM_FLAGS("-march=i686 -mtune=atom -mstackrealign -msse3 -mfpmath=sse -m32 -flto -ffast-math -funroll-loops")
@@ -887,39 +887,39 @@ MACRO(NL_SETUP_BUILD)
       ELSEIF(TARGET_MIPS)
         ADD_PLATFORM_FLAGS("-fpic -finline-functions -fmessage-length=0 -fno-inline-functions-called-once -fgcse-after-reload -frerun-cse-after-loop -frename-registers -fno-strict-aliasing")
         SET(RELEASE_CFLAGS "${RELEASE_CFLAGS} -funswitch-loops -finline-limit=300")
-      ENDIF(TARGET_ARM)
+      ENDIF()
       SET(PLATFORM_LINKFLAGS "${PLATFORM_LINKFLAGS} -Wl,-z,noexecstack -Wl,-z,relro -Wl,-z,now")
       SET(PLATFORM_LINKFLAGS "${PLATFORM_LINKFLAGS} -L${PLATFORM_ROOT}/usr/lib")
-    ENDIF(ANDROID)
+    ENDIF()
 
     IF(APPLE)
       ADD_PLATFORM_FLAGS("-gdwarf-2 -D_DARWIN_UNLIMITED_STREAMS")
-    ENDIF(APPLE)
+    ENDIF()
 
     # Fix "relocation R_X86_64_32 against.." error on x64 platforms
     IF(TARGET_X64 AND WITH_STATIC AND NOT WITH_STATIC_DRIVERS AND NOT MINGW)
       ADD_PLATFORM_FLAGS("-fPIC")
-    ENDIF(TARGET_X64 AND WITH_STATIC AND NOT WITH_STATIC_DRIVERS AND NOT MINGW)
+    ENDIF()
 
     SET(PLATFORM_CXXFLAGS "${PLATFORM_CXXFLAGS} -ftemplate-depth-48")
 
     IF(NOT APPLE)
       SET(PLATFORM_LINKFLAGS "${PLATFORM_LINKFLAGS} -Wl,--no-undefined -Wl,--as-needed")
-    ENDIF(NOT APPLE)
+    ENDIF()
 
     IF(WITH_SYMBOLS)
       SET(NL_RELEASE_CFLAGS "${NL_RELEASE_CFLAGS} -g")
-    ELSE(WITH_SYMBOLS)
+    ELSE()
       IF(APPLE)
         SET(NL_RELEASE_LINKFLAGS "-Wl,-dead_strip ${NL_RELEASE_LINKFLAGS}")
-      ELSE(APPLE)
+      ELSE()
         SET(NL_RELEASE_LINKFLAGS "-Wl,-s ${NL_RELEASE_LINKFLAGS}")
-      ENDIF(APPLE)
+      ENDIF()
-    ENDIF(WITH_SYMBOLS)
+    ENDIF()
 
     SET(NL_DEBUG_CFLAGS "-g -DNL_DEBUG -D_DEBUG ${NL_DEBUG_CFLAGS}")
     SET(NL_RELEASE_CFLAGS "-DNL_RELEASE -DNDEBUG -O3 ${NL_RELEASE_CFLAGS}")
-  ENDIF(MSVC)
+  ENDIF()
 ENDMACRO(NL_SETUP_BUILD)
 
 MACRO(NL_SETUP_BUILD_FLAGS)
@@ -954,7 +954,7 @@ MACRO(NL_MAKE_ABSOLUTE_PREFIX NAME_RELATIVE NAME_ABSOLUTE)
     ELSE()
       SET(${NAME_ABSOLUTE} ${${NAME_RELATIVE}})
     ENDIF()
-  ENDIF(IS_ABSOLUTE "${${NAME_RELATIVE}}")
+  ENDIF()
 ENDMACRO(NL_MAKE_ABSOLUTE_PREFIX)
 
 MACRO(NL_SETUP_PREFIX_PATHS)
@@ -1031,7 +1031,7 @@ MACRO(RYZOM_SETUP_PREFIX_PATHS)
     ELSE()
       SET(RYZOM_ETC_PREFIX "." CACHE PATH "Installation path for configurations")
     ENDIF()
-  ENDIF(NOT RYZOM_ETC_PREFIX)
+  ENDIF()
   NL_MAKE_ABSOLUTE_PREFIX(RYZOM_ETC_PREFIX RYZOM_ETC_ABSOLUTE_PREFIX)
 
   ## Allow override of install_prefix/share path.
@@ -1071,7 +1071,7 @@ MACRO(RYZOM_SETUP_PREFIX_PATHS)
     ELSE()
       SET(RYZOM_LIB_PREFIX "lib" CACHE PATH "Installation path for libraries.")
     ENDIF()
-  ENDIF(NOT RYZOM_LIB_PREFIX)
+  ENDIF()
   NL_MAKE_ABSOLUTE_PREFIX(RYZOM_LIB_PREFIX RYZOM_LIB_ABSOLUTE_PREFIX)
 
   ## Allow override of install_prefix/games path.
@@ -1089,7 +1089,7 @@ ENDMACRO(RYZOM_SETUP_PREFIX_PATHS)
 MACRO(SETUP_EXTERNAL)
   IF(WITH_EXTERNAL)
     FIND_PACKAGE(External REQUIRED)
-  ENDIF(WITH_EXTERNAL)
+  ENDIF()
 
   IF(WIN32)
     FIND_PACKAGE(External REQUIRED)
@@ -1098,8 +1098,8 @@ MACRO(SETUP_EXTERNAL)
     IF(DEFINED BOOST_DIR)
       SET(BOOST_INCLUDEDIR ${BOOST_DIR}/include)
       SET(BOOST_LIBRARYDIR ${BOOST_DIR}/lib)
-    ENDIF(DEFINED BOOST_DIR)
+    ENDIF()
-  ELSE(WIN32)
+  ELSE()
     FIND_PACKAGE(External QUIET)
 
     IF(APPLE)
@@ -1108,28 +1108,28 @@ MACRO(SETUP_EXTERNAL)
       ELSE()
         SET(CMAKE_FIND_LIBRARY_SUFFIXES .dylib .so .a)
       ENDIF()
-    ELSE(APPLE)
+    ELSE()
       IF(WITH_STATIC_EXTERNAL)
         SET(CMAKE_FIND_LIBRARY_SUFFIXES .a .so)
       ELSE()
         SET(CMAKE_FIND_LIBRARY_SUFFIXES .so .a)
       ENDIF()
-    ENDIF(APPLE)
+    ENDIF()
-  ENDIF(WIN32)
+  ENDIF()
 
   # Android and iOS have pthread
   IF(ANDROID OR IOS)
     SET(CMAKE_USE_PTHREADS_INIT 1)
     SET(Threads_FOUND TRUE)
-  ELSE(ANDROID OR IOS)
+  ELSE()
     FIND_PACKAGE(Threads REQUIRED)
     # TODO: replace all -l<lib> by absolute path to <lib> in CMAKE_THREAD_LIBS_INIT
-  ENDIF(ANDROID OR IOS)
+  ENDIF()
 
   IF(WITH_STLPORT)
     FIND_PACKAGE(STLport REQUIRED)
     INCLUDE_DIRECTORIES(${STLPORT_INCLUDE_DIR})
-  ENDIF(WITH_STLPORT)
+  ENDIF()
 
   IF(WIN32)
     # Must include DXSDK before WINSDK
@@ -1137,10 +1137,10 @@ MACRO(SETUP_EXTERNAL)
     # IF(DXSDK_INCLUDE_DIR)
     #   INCLUDE_DIRECTORIES(${DXSDK_INCLUDE_DIR})
     # ENDIF()
-  ENDIF(WIN32)
+  ENDIF()
 
   IF(MSVC)
     FIND_PACKAGE(MSVC REQUIRED)
     FIND_PACKAGE(WindowsSDK REQUIRED)
-  ENDIF(MSVC)
+  ENDIF()
 ENDMACRO(SETUP_EXTERNAL)

code/nel/CMakeLists.txt

@@ -2,23 +2,23 @@ PROJECT(NeL CXX C)
 
 IF(WITH_STATIC_DRIVERS)
   ADD_DEFINITIONS(-DNL_STATIC)
-ENDIF(WITH_STATIC_DRIVERS)
+ENDIF()
 
 IF(WIN32)
   # On Win32 we can also build the MAX plugins.
   IF(WITH_NEL_MAXPLUGIN)
     FIND_PACKAGE(3dsMaxSDK)
-  ENDIF(WITH_NEL_MAXPLUGIN)
+  ENDIF()
-ENDIF(WIN32)
+ENDIF()
 
 IF(WITH_3D)
   FIND_PACKAGE(FreeType)
 
   IF(WITH_NEL_CEGUI)
     FIND_PACKAGE(CEGUI)
-  ENDIF(WITH_NEL_CEGUI)
+  ENDIF()
 
-ENDIF(WITH_3D)
+ENDIF()
 
 IF(WITH_SOUND)
   FIND_PACKAGE(Ogg)
@@ -26,24 +26,24 @@ IF(WITH_SOUND)
 
   IF(WITH_DRIVER_OPENAL)
     FIND_PACKAGE(OpenAL)
-  ENDIF(WITH_DRIVER_OPENAL)
+  ENDIF()
 
   IF(WITH_DRIVER_FMOD)
     FIND_PACKAGE(FMOD)
-  ENDIF(WITH_DRIVER_FMOD)
+  ENDIF()
-ENDIF(WITH_SOUND)
+ENDIF()
 
 IF(WITH_GTK)
   FIND_PACKAGE(GTK2)
-ENDIF(WITH_GTK)
+ENDIF()
 
 IF(WITH_LIBOVR)
   FIND_PACKAGE(LibOVR)
-ENDIF(WITH_LIBOVR)
+ENDIF()
 
 IF(WITH_LIBVR)
   FIND_PACKAGE(LibVR)
-ENDIF(WITH_LIBVR)
+ENDIF()
 
 IF(WITH_INSTALL_LIBRARIES)
   IF(UNIX)
@@ -61,7 +61,7 @@ IF(WITH_INSTALL_LIBRARIES)
     CONFIGURE_FILE(nel-config.in ${CMAKE_CURRENT_BINARY_DIR}/nel-config)
 
     INSTALL(PROGRAMS ${CMAKE_CURRENT_BINARY_DIR}/nel-config DESTINATION ${NL_BIN_PREFIX})
-  ENDIF(UNIX)
+  ENDIF()
 
   ADD_SUBDIRECTORY(include)
 ENDIF()

code/nel/include/nel/CMakeLists.txt

@@ -2,36 +2,36 @@ SUBDIRS(misc)
 
 IF(WITH_3D)
   SUBDIRS(3d)
-ENDIF(WITH_3D)
+ENDIF()
 
 IF(WITH_GUI)
   ADD_SUBDIRECTORY(gui)
-ENDIF(WITH_GUI)
+ENDIF()
 
 IF(WITH_GEORGES)
   SUBDIRS(georges)
-ENDIF(WITH_GEORGES)
+ENDIF()
 
 IF(WITH_LIGO)
   SUBDIRS(ligo)
-ENDIF(WITH_LIGO)
+ENDIF()
 
 IF(WITH_LOGIC)
   SUBDIRS(logic)
-ENDIF(WITH_LOGIC)
+ENDIF()
 
 IF(WITH_NET)
   SUBDIRS(net)
-ENDIF(WITH_NET)
+ENDIF()
 
 IF(WITH_SOUND)
   SUBDIRS(sound)
-ENDIF(WITH_SOUND)
+ENDIF()
 
 IF(WITH_PACS)
   SUBDIRS(pacs)
-ENDIF(WITH_PACS)
+ENDIF()
 
 IF(WITH_NEL_CEGUI)
   SUBDIRS(cegui)
-ENDIF(WITH_NEL_CEGUI)
+ENDIF()

code/nel/samples/3d/CMakeLists.txt

@@ -4,8 +4,8 @@ ADD_SUBDIRECTORY(shape_viewer)
 
 IF(WITH_NEL_CEGUI)
   ADD_SUBDIRECTORY(cegui)
-ENDIF(WITH_NEL_CEGUI)
+ENDIF()
 
 #IF(WITH_QT)
 #  ADD_SUBDIRECTORY(qtnel)
-#ENDIF(WITH_QT)
+#ENDIF()

code/nel/samples/CMakeLists.txt

@@ -2,20 +2,20 @@ ADD_SUBDIRECTORY(misc)
 
 IF(WITH_3D)
   ADD_SUBDIRECTORY(3d)
-ENDIF(WITH_3D)
+ENDIF()
 
 IF(WITH_GEORGES)
   ADD_SUBDIRECTORY(georges)
-ENDIF(WITH_GEORGES)
+ENDIF()
 
 IF(WITH_NET)
   ADD_SUBDIRECTORY(net)
-ENDIF(WITH_NET)
+ENDIF()
 
 IF(WITH_PACS)
   ADD_SUBDIRECTORY(pacs)
-ENDIF(WITH_PACS)
+ENDIF()
 
 IF(WITH_SOUND)
   ADD_SUBDIRECTORY(sound)
-ENDIF(WITH_SOUND)
+ENDIF()

code/nel/samples/net/udp/CMakeLists.txt

@@ -8,7 +8,7 @@ ADD_DEFINITIONS(-DUDP_DIR="\\"${NL_SHARE_ABSOLUTE_PREFIX}/nl_sample_udp/\\"")
 
 IF(WITH_3D)
   ADD_DEFINITIONS(-DUSE_3D)
-ENDIF(WITH_3D)
+ENDIF()
 
 TARGET_LINK_LIBRARIES(nl_sample_udpclient nelmisc nelnet nel3d)
 TARGET_LINK_LIBRARIES(nl_sample_udpserver nelmisc nelnet)
@@ -22,4 +22,4 @@ INSTALL(FILES bench_service.cfg client.cfg readme.txt DESTINATION ${NL_SHARE_PRE
 
 IF(WITH_3D)
   INSTALL(FILES n019003l.pfb DESTINATION ${NL_SHARE_PREFIX}/nl_sample_udp COMPONENT samplesnet)
-ENDIF(WITH_3D)
+ENDIF()

code/nel/src/3d/CMakeLists.txt

@@ -730,12 +730,12 @@ ADD_DEFINITIONS(${LIBVR_DEFINITIONS})
 
 IF(WITH_PCH)
   ADD_NATIVE_PRECOMPILED_HEADER(nel3d ${CMAKE_CURRENT_SOURCE_DIR}/std3d.h ${CMAKE_CURRENT_SOURCE_DIR}/std3d.cpp)
-ENDIF(WITH_PCH)
+ENDIF()
 
 NL_GEN_PC(nel-3d.pc)
 
 IF((WITH_INSTALL_LIBRARIES AND WITH_STATIC) OR NOT WITH_STATIC)
   INSTALL(TARGETS nel3d LIBRARY DESTINATION ${NL_LIB_PREFIX} ARCHIVE DESTINATION ${NL_LIB_PREFIX} COMPONENT libraries)
-ENDIF((WITH_INSTALL_LIBRARIES AND WITH_STATIC) OR NOT WITH_STATIC)
+ENDIF()
 
 ADD_SUBDIRECTORY(driver)

code/nel/src/3d/driver/CMakeLists.txt

@@ -1,13 +1,13 @@
 IF(WITH_DRIVER_OPENGL)
   ADD_SUBDIRECTORY(opengl)
-ENDIF(WITH_DRIVER_OPENGL)
+ENDIF()
 
 IF(WITH_DRIVER_OPENGLES)
   ADD_SUBDIRECTORY(opengles)
-ENDIF(WITH_DRIVER_OPENGLES)
+ENDIF()
 
 IF(WIN32)
   IF(WITH_DRIVER_DIRECT3D)
     ADD_SUBDIRECTORY(direct3d)
-  ENDIF(WITH_DRIVER_DIRECT3D)
+  ENDIF()
-ENDIF(WIN32)
+ENDIF()

code/nel/src/CMakeLists.txt

@@ -2,40 +2,40 @@ ADD_SUBDIRECTORY(misc)
 
 IF(WITH_3D)
   ADD_SUBDIRECTORY(3d)
-ENDIF(WITH_3D)
+ENDIF()
 
 IF(WITH_GUI)
   ADD_SUBDIRECTORY(gui)
-ENDIF(WITH_GUI)
+ENDIF()
 
 IF(WITH_GEORGES)
   ADD_SUBDIRECTORY(georges)
-ENDIF(WITH_GEORGES)
+ENDIF()
 
 IF(WITH_LIGO)
   ADD_SUBDIRECTORY(ligo)
-ENDIF(WITH_LIGO)
+ENDIF()
 
 IF(WITH_LOGIC)
   ADD_SUBDIRECTORY(logic)
-ENDIF(WITH_LOGIC)
+ENDIF()
 
 IF(WITH_NET)
   ADD_SUBDIRECTORY(net)
-ENDIF(WITH_NET)
+ENDIF()
 
 IF(WITH_SOUND)
   ADD_SUBDIRECTORY(sound)
-ENDIF(WITH_SOUND)
+ENDIF()
 
 IF(WITH_NEL_CEGUI)
   ADD_SUBDIRECTORY(cegui)
-ENDIF(WITH_NEL_CEGUI)
+ENDIF()
 
 IF(WITH_PACS)
   ADD_SUBDIRECTORY(pacs)
-ENDIF(WITH_PACS)
+ENDIF()
 
 IF(WITH_NEL_TOOLS)
   ADD_SUBDIRECTORY(pipeline)
-ENDIF(WITH_NEL_TOOLS)
+ENDIF()

code/nel/src/cegui/CMakeLists.txt

@@ -14,4 +14,4 @@ ADD_DEFINITIONS(${LIBXML2_DEFINITIONS} -DNEL_CEGUIRENDERER_EXPORTS)
 
 IF((WITH_INSTALL_LIBRARIES AND WITH_STATIC) OR NOT WITH_STATIC)
   INSTALL(TARGETS nelceguirenderer RUNTIME DESTINATION ${NL_BIN_PREFIX} LIBRARY DESTINATION ${NL_LIB_PREFIX} ARCHIVE DESTINATION ${NL_LIB_PREFIX} COMPONENT libraries)
-ENDIF((WITH_INSTALL_LIBRARIES AND WITH_STATIC) OR NOT WITH_STATIC)
+ENDIF()

code/nel/src/georges/CMakeLists.txt

@@ -17,10 +17,10 @@ ADD_DEFINITIONS(${LIBXML2_DEFINITIONS})
 
 IF(WITH_PCH)
   ADD_NATIVE_PRECOMPILED_HEADER(nelgeorges ${CMAKE_CURRENT_SOURCE_DIR}/stdgeorges.h ${CMAKE_CURRENT_SOURCE_DIR}/stdgeorges.cpp)
-ENDIF(WITH_PCH)
+ENDIF()
 
 NL_GEN_PC(nel-georges.pc)
 
 IF((WITH_INSTALL_LIBRARIES AND WITH_STATIC) OR NOT WITH_STATIC)
   INSTALL(TARGETS nelgeorges LIBRARY DESTINATION ${NL_LIB_PREFIX} ARCHIVE DESTINATION ${NL_LIB_PREFIX} COMPONENT libraries)
-ENDIF((WITH_INSTALL_LIBRARIES AND WITH_STATIC) OR NOT WITH_STATIC)
+ENDIF()

code/nel/src/gui/CMakeLists.txt

@@ -18,8 +18,8 @@ ADD_DEFINITIONS(${LIBXML2_DEFINITIONS} ${CURL_DEFINITIONS} ${LUABIND_DEFINITIONS
 
 IF(WITH_PCH)
   ADD_NATIVE_PRECOMPILED_HEADER(nelgui ${CMAKE_CURRENT_SOURCE_DIR}/stdpch.h ${CMAKE_CURRENT_SOURCE_DIR}/stdpch.cpp)
-ENDIF(WITH_PCH)
+ENDIF()
 
 IF((WITH_INSTALL_LIBRARIES AND WITH_STATIC) OR NOT WITH_STATIC)
   INSTALL(TARGETS nelgui LIBRARY DESTINATION ${NL_LIB_PREFIX} ARCHIVE DESTINATION ${NL_LIB_PREFIX} COMPONENT libraries)
-ENDIF((WITH_INSTALL_LIBRARIES AND WITH_STATIC) OR NOT WITH_STATIC)
+ENDIF()

code/nel/src/ligo/CMakeLists.txt

@@ -15,10 +15,10 @@ ADD_DEFINITIONS(${LIBXML2_DEFINITIONS})
 
 IF(WITH_PCH)
   ADD_NATIVE_PRECOMPILED_HEADER(nelligo ${CMAKE_CURRENT_SOURCE_DIR}/stdligo.h ${CMAKE_CURRENT_SOURCE_DIR}/stdligo.cpp)
-ENDIF(WITH_PCH)
+ENDIF()
 
 NL_GEN_PC(nel-ligo.pc)
 
 IF((WITH_INSTALL_LIBRARIES AND WITH_STATIC) OR NOT WITH_STATIC)
   INSTALL(TARGETS nelligo LIBRARY DESTINATION ${NL_LIB_PREFIX} ARCHIVE DESTINATION ${NL_LIB_PREFIX} COMPONENT libraries)
-ENDIF((WITH_INSTALL_LIBRARIES AND WITH_STATIC) OR NOT WITH_STATIC)
+ENDIF()

code/nel/src/logic/CMakeLists.txt

@@ -15,8 +15,8 @@ ADD_DEFINITIONS(${LIBXML2_DEFINITIONS})
 
 IF(WITH_PCH)
   ADD_NATIVE_PRECOMPILED_HEADER(nellogic ${CMAKE_CURRENT_SOURCE_DIR}/stdlogic.h ${CMAKE_CURRENT_SOURCE_DIR}/stdlogic.cpp)
-ENDIF(WITH_PCH)
+ENDIF()
 
 IF((WITH_INSTALL_LIBRARIES AND WITH_STATIC) OR NOT WITH_STATIC)
   INSTALL(TARGETS nellogic LIBRARY DESTINATION ${NL_LIB_PREFIX} ARCHIVE DESTINATION ${NL_LIB_PREFIX} COMPONENT libraries)
-ENDIF((WITH_INSTALL_LIBRARIES AND WITH_STATIC) OR NOT WITH_STATIC)
+ENDIF()

code/nel/src/misc/CMakeLists.txt

@@ -179,34 +179,34 @@ IF(WITH_GTK)
     INCLUDE_DIRECTORIES(${GTK2_INCLUDE_DIRS})
     ADD_DEFINITIONS(-DNL_USE_GTK)
     TARGET_LINK_LIBRARIES(nelmisc ${GTK2_LIBRARIES})
-  ENDIF(GTK2_FOUND)
+  ENDIF()
-ENDIF(WITH_GTK)
+ENDIF()
 
 IF(JPEG_FOUND)
   INCLUDE_DIRECTORIES(${JPEG_INCLUDE_DIR})
   ADD_DEFINITIONS(-DUSE_JPEG)
   TARGET_LINK_LIBRARIES(nelmisc ${JPEG_LIBRARY})
-ENDIF(JPEG_FOUND)
+ENDIF()
 
 IF(GIF_FOUND)
   INCLUDE_DIRECTORIES(${GIF_INCLUDE_DIR})
   ADD_DEFINITIONS(-DUSE_GIF)
   TARGET_LINK_LIBRARIES(nelmisc ${GIF_LIBRARY})
-ENDIF(GIF_FOUND)
+ENDIF()
 
 IF(WITH_STATIC OR WIN32)
   TARGET_LINK_LIBRARIES(nelmisc ${PNG_LIBRARIES})
-ELSE(WITH_STATIC OR WIN32)
+ELSE()
   # Link only with libpng shared library
   TARGET_LINK_LIBRARIES(nelmisc ${PNG_LIBRARY})
-ENDIF(WITH_STATIC OR WIN32)
+ENDIF()
 
 IF(UNIX)
   TARGET_LINK_LIBRARIES(nelmisc -lc -ldl)
   IF(NOT APPLE)
     TARGET_LINK_LIBRARIES(nelmisc -lrt)
-  ENDIF(NOT APPLE)
+  ENDIF()
-ENDIF(UNIX)
+ENDIF()
 
 INCLUDE_DIRECTORIES(${LIBXML2_INCLUDE_DIR} ${PNG_INCLUDE_DIR} config_file)
 
@@ -220,10 +220,10 @@ ADD_DEFINITIONS(${LIBXML2_DEFINITIONS})
 
 IF(WITH_PCH)
   ADD_NATIVE_PRECOMPILED_HEADER(nelmisc ${CMAKE_CURRENT_SOURCE_DIR}/stdmisc.h ${CMAKE_CURRENT_SOURCE_DIR}/stdmisc.cpp)
-ENDIF(WITH_PCH)
+ENDIF()
 
 NL_GEN_PC(nel-misc.pc)
 
 IF((WITH_INSTALL_LIBRARIES AND WITH_STATIC) OR NOT WITH_STATIC)
   INSTALL(TARGETS nelmisc LIBRARY DESTINATION ${NL_LIB_PREFIX} ARCHIVE DESTINATION ${NL_LIB_PREFIX} COMPONENT libraries)
-ENDIF((WITH_INSTALL_LIBRARIES AND WITH_STATIC) OR NOT WITH_STATIC)
+ENDIF()

code/nel/src/net/CMakeLists.txt

@@ -9,8 +9,8 @@ IF(WITH_GTK)
   IF(GTK2_FOUND)
     INCLUDE_DIRECTORIES(${GTK2_INCLUDE_DIRS})
     ADD_DEFINITIONS(-DNL_USE_GTK)
-  ENDIF(GTK2_FOUND)
+  ENDIF()
-ENDIF(WITH_GTK)
+ENDIF()
 
 TARGET_LINK_LIBRARIES(nelnet nelmisc)
 NL_DEFAULT_PROPS(nelnet "NeL, Library: NeL Net")
@@ -20,10 +20,10 @@ NL_ADD_LIB_SUFFIX(nelnet)
 
 IF(WITH_PCH)
   ADD_NATIVE_PRECOMPILED_HEADER(nelnet ${CMAKE_CURRENT_SOURCE_DIR}/stdnet.h ${CMAKE_CURRENT_SOURCE_DIR}/stdnet.cpp)
-ENDIF(WITH_PCH)
+ENDIF()
 
 NL_GEN_PC(nel-net.pc)
 
 IF((WITH_INSTALL_LIBRARIES AND WITH_STATIC) OR NOT WITH_STATIC)
   INSTALL(TARGETS nelnet LIBRARY DESTINATION ${NL_LIB_PREFIX} ARCHIVE DESTINATION ${NL_LIB_PREFIX} COMPONENT libraries)
-ENDIF((WITH_INSTALL_LIBRARIES AND WITH_STATIC) OR NOT WITH_STATIC)
+ENDIF()

code/nel/src/pacs/CMakeLists.txt

@@ -15,10 +15,10 @@ ADD_DEFINITIONS(${LIBXML2_DEFINITIONS})
 
 IF(WITH_PCH)
   ADD_NATIVE_PRECOMPILED_HEADER(nelpacs ${CMAKE_CURRENT_SOURCE_DIR}/stdpacs.h ${CMAKE_CURRENT_SOURCE_DIR}/stdpacs.cpp)
-ENDIF(WITH_PCH)
+ENDIF()
 
 NL_GEN_PC(nel-pacs.pc)
 
 IF((WITH_INSTALL_LIBRARIES AND WITH_STATIC) OR NOT WITH_STATIC)
   INSTALL(TARGETS nelpacs LIBRARY DESTINATION ${NL_LIB_PREFIX} ARCHIVE DESTINATION ${NL_LIB_PREFIX} COMPONENT libraries)
-ENDIF((WITH_INSTALL_LIBRARIES AND WITH_STATIC) OR NOT WITH_STATIC)
+ENDIF()

code/nel/src/pipeline/CMakeLists.txt

@@ -15,4 +15,4 @@ NL_ADD_LIB_SUFFIX(nelpipeline)
 
 IF((WITH_INSTALL_LIBRARIES AND WITH_STATIC) OR NOT WITH_STATIC)
   INSTALL(TARGETS nelpipeline LIBRARY DESTINATION ${NL_LIB_PREFIX} ARCHIVE DESTINATION ${NL_LIB_PREFIX} COMPONENT libraries)
-ENDIF((WITH_INSTALL_LIBRARIES AND WITH_STATIC) OR NOT WITH_STATIC)
+ENDIF()

code/nel/src/sound/CMakeLists.txt

@@ -93,7 +93,7 @@ TARGET_LINK_LIBRARIES(nelsound ${VORBISFILE_LIBRARY} ${VORBIS_LIBRARY})
 IF(WITH_STATIC)
   # Add libogg dependency only if target is static because to libvorbisfile
   TARGET_LINK_LIBRARIES(nelsound ${OGG_LIBRARY})
-ENDIF(WITH_STATIC)
+ENDIF()
 
 
 INCLUDE_DIRECTORIES(${LIBXML2_INCLUDE_DIR})
@@ -108,12 +108,12 @@ ADD_DEFINITIONS(${LIBXML2_DEFINITIONS})
 
 IF(WITH_PCH)
   ADD_NATIVE_PRECOMPILED_HEADER(nelsound ${CMAKE_CURRENT_SOURCE_DIR}/stdsound.h ${CMAKE_CURRENT_SOURCE_DIR}/stdsound.cpp)
-ENDIF(WITH_PCH)
+ENDIF()
 
 NL_GEN_PC(nel-sound.pc)
 
 IF((WITH_INSTALL_LIBRARIES AND WITH_STATIC) OR NOT WITH_STATIC)
   INSTALL(TARGETS nelsound LIBRARY DESTINATION ${NL_LIB_PREFIX} ARCHIVE DESTINATION ${NL_LIB_PREFIX} COMPONENT libraries)
-ENDIF((WITH_INSTALL_LIBRARIES AND WITH_STATIC) OR NOT WITH_STATIC)
+ENDIF()
 
 ADD_SUBDIRECTORY(driver)

code/nel/src/sound/driver/CMakeLists.txt

@@ -12,24 +12,24 @@ NL_ADD_LIB_SUFFIX(nelsnd_lowlevel)
 
 IF(WITH_PCH)
   ADD_NATIVE_PRECOMPILED_HEADER(nelsnd_lowlevel ${CMAKE_CURRENT_SOURCE_DIR}/stdsound_lowlevel.h ${CMAKE_CURRENT_SOURCE_DIR}/stdsound_lowlevel.cpp)
-ENDIF(WITH_PCH)
+ENDIF()
 
 IF((WITH_INSTALL_LIBRARIES AND WITH_STATIC) OR NOT WITH_STATIC)
   INSTALL(TARGETS nelsnd_lowlevel LIBRARY DESTINATION ${NL_LIB_PREFIX} ARCHIVE DESTINATION ${NL_LIB_PREFIX} COMPONENT libraries)
-ENDIF((WITH_INSTALL_LIBRARIES AND WITH_STATIC) OR NOT WITH_STATIC)
+ENDIF()
 
 IF(WITH_DRIVER_OPENAL)
   ADD_SUBDIRECTORY(openal)
-ENDIF(WITH_DRIVER_OPENAL)
+ENDIF()
 
 IF(WITH_DRIVER_FMOD)
   ADD_SUBDIRECTORY(fmod)
-ENDIF(WITH_DRIVER_FMOD)
+ENDIF()
 
 IF(WITH_DRIVER_DSOUND)
   ADD_SUBDIRECTORY(dsound)
-ENDIF(WITH_DRIVER_DSOUND)
+ENDIF()
 
 IF(WITH_DRIVER_XAUDIO2)
   ADD_SUBDIRECTORY(xaudio2)
-ENDIF(WITH_DRIVER_XAUDIO2)
+ENDIF()

code/nel/tools/3d/CMakeLists.txt

@@ -48,9 +48,9 @@ IF(WIN32 AND WITH_3D)
       IF(MAXSDK_FOUND)
         ADD_SUBDIRECTORY(plugin_max)
         ADD_SUBDIRECTORY(ligo)
-      ENDIF(MAXSDK_FOUND)
+      ENDIF()
-    ENDIF(WITH_NEL_MAXPLUGIN)
+    ENDIF()
-  ENDIF(MFC_FOUND)
+  ENDIF()
 ENDIF()
 
 IF(WITH_NEL_TOOLS AND WITH_3D)
@@ -59,8 +59,8 @@ IF(WITH_NEL_TOOLS AND WITH_3D)
     IF(MFC_FOUND)
       ADD_SUBDIRECTORY(object_viewer_exe)
       ADD_SUBDIRECTORY(tile_edit)
-    ENDIF(MFC_FOUND)
+    ENDIF()
-  ENDIF(WIN32)
+  ENDIF()
 
   IF(WITH_QT OR WITH_QT5)
     ADD_SUBDIRECTORY(tile_edit_qt)

code/nel/tools/3d/mesh_utils/CMakeLists.txt

@@ -13,4 +13,4 @@ NL_ADD_RUNTIME_FLAGS(mesh_utils)
 
 IF((WITH_INSTALL_LIBRARIES AND WITH_STATIC) OR NOT WITH_STATIC)
   INSTALL(TARGETS mesh_utils LIBRARY DESTINATION ${NL_LIB_PREFIX} ARCHIVE DESTINATION ${NL_LIB_PREFIX} COMPONENT tools3d)
-ENDIF((WITH_INSTALL_LIBRARIES AND WITH_STATIC) OR NOT WITH_STATIC)
+ENDIF()

code/nel/tools/3d/object_viewer/CMakeLists.txt

@@ -17,11 +17,11 @@ ADD_DEFINITIONS(${MFC_DEFINITIONS} -DOBJECT_VIEWER_LIB_EXPORTS)
 
 IF(WITH_PCH)
   ADD_NATIVE_PRECOMPILED_HEADER(object_viewer_dll ${CMAKE_CURRENT_SOURCE_DIR}/std_afx.h ${CMAKE_CURRENT_SOURCE_DIR}/std_afx.cpp)
-ENDIF(WITH_PCH)
+ENDIF()
 
 INSTALL(TARGETS object_viewer_dll LIBRARY DESTINATION ${NL_LIB_PREFIX} RUNTIME DESTINATION ${NL_BIN_PREFIX} ARCHIVE DESTINATION ${NL_LIB_PREFIX} COMPONENT tools3d)
 INSTALL(FILES object_viewer.cfg DESTINATION ${NL_ETC_PREFIX} COMPONENT tools3d)
 IF(WITH_MAXPLUGIN)
   INSTALL(TARGETS object_viewer_dll RUNTIME DESTINATION maxplugin COMPONENT tools3d)
   INSTALL(FILES object_viewer.cfg DESTINATION maxplugin COMPONENT tools3d)
-ENDIF(WITH_MAXPLUGIN)
+ENDIF()

code/nel/tools/3d/object_viewer_exe/CMakeLists.txt

@@ -17,9 +17,9 @@ NL_ADD_RUNTIME_FLAGS(object_viewer)
 
 IF(WITH_PCH)
   ADD_NATIVE_PRECOMPILED_HEADER(object_viewer ${CMAKE_CURRENT_SOURCE_DIR}/std_afx.h ${CMAKE_CURRENT_SOURCE_DIR}/std_afx.cpp)
-ENDIF(WITH_PCH)
+ENDIF()
 
 INSTALL(TARGETS object_viewer RUNTIME DESTINATION ${NL_BIN_PREFIX} COMPONENT tools3d)
 IF(WITH_MAXPLUGIN)
   INSTALL(TARGETS object_viewer RUNTIME DESTINATION maxplugin COMPONENT tools3d)
-ENDIF(WITH_MAXPLUGIN)
+ENDIF()

code/nel/tools/3d/plugin_max/nel_3dsmax_shared/CMakeLists.txt

@@ -20,6 +20,6 @@ ADD_DEFINITIONS(-DNEL_3DSMAX_SHARED_EXPORTS)
 
 IF(WITH_PCH)
   ADD_NATIVE_PRECOMPILED_HEADER(nel_3dsmax_shared ${CMAKE_CURRENT_SOURCE_DIR}/StdAfx.h ${CMAKE_CURRENT_SOURCE_DIR}/StdAfx.cpp)
-ENDIF(WITH_PCH)
+ENDIF()
 
 INSTALL(TARGETS nel_3dsmax_shared RUNTIME DESTINATION maxplugin/plugins LIBRARY DESTINATION ${NL_LIB_PREFIX} ARCHIVE DESTINATION ${NL_LIB_PREFIX} COMPONENT libraries)

code/nel/tools/3d/plugin_max/nel_export/CMakeLists.txt

@@ -27,6 +27,6 @@ SET_TARGET_PROPERTIES(nel_export PROPERTIES SUFFIX ".dlu")
 
 IF(WITH_PCH)
   ADD_NATIVE_PRECOMPILED_HEADER(nel_export ${CMAKE_CURRENT_SOURCE_DIR}/std_afx.h ${CMAKE_CURRENT_SOURCE_DIR}/std_afx.cpp)
-ENDIF(WITH_PCH)
+ENDIF()
 
 INSTALL(TARGETS nel_export RUNTIME DESTINATION maxplugin/plugins LIBRARY DESTINATION ${NL_LIB_PREFIX} ARCHIVE DESTINATION ${NL_LIB_PREFIX} COMPONENT libraries)

code/nel/tools/3d/plugin_max/nel_mesh_lib/CMakeLists.txt

@@ -10,6 +10,6 @@ NL_ADD_LIB_SUFFIX(nel_mesh_lib)
 
 IF(WITH_PCH)
   ADD_NATIVE_PRECOMPILED_HEADER(nel_mesh_lib ${CMAKE_CURRENT_SOURCE_DIR}/StdAfx.h ${CMAKE_CURRENT_SOURCE_DIR}/StdAfx.cpp)
-ENDIF(WITH_PCH)
+ENDIF()
 
 INSTALL(TARGETS nel_mesh_lib RUNTIME DESTINATION maxplugin/plugins LIBRARY DESTINATION ${NL_LIB_PREFIX} ARCHIVE DESTINATION ${NL_LIB_PREFIX} COMPONENT libraries)

code/nel/tools/3d/plugin_max/nel_patch_edit/CMakeLists.txt

@@ -20,6 +20,6 @@ NL_ADD_LIB_SUFFIX(nel_patch_edit)
 
 IF(WITH_PCH)
   ADD_NATIVE_PRECOMPILED_HEADER(nel_patch_edit ${CMAKE_CURRENT_SOURCE_DIR}/stdafx.h ${CMAKE_CURRENT_SOURCE_DIR}/stdafx.cpp)
-ENDIF(WITH_PCH)
+ENDIF()
 
 INSTALL(TARGETS nel_patch_edit RUNTIME DESTINATION maxplugin/plugins LIBRARY DESTINATION ${NL_LIB_PREFIX} ARCHIVE DESTINATION ${NL_LIB_PREFIX} COMPONENT libraries)

code/nel/tools/3d/s3tc_compressor_lib/CMakeLists.txt

@@ -13,4 +13,4 @@ ADD_DEFINITIONS(${SQUISH_DEFINITIONS})
 
 IF((WITH_INSTALL_LIBRARIES AND WITH_STATIC) OR NOT WITH_STATIC)
   INSTALL(TARGETS s3tc_compressor LIBRARY DESTINATION ${NL_LIB_PREFIX} ARCHIVE DESTINATION ${NL_LIB_PREFIX} COMPONENT tools3d)
-ENDIF((WITH_INSTALL_LIBRARIES AND WITH_STATIC) OR NOT WITH_STATIC)
+ENDIF()

code/nel/tools/3d/shared_widgets/CMakeLists.txt

@@ -25,4 +25,4 @@ NL_ADD_RUNTIME_FLAGS(shared_widgets)
 
 IF((WITH_INSTALL_LIBRARIES AND WITH_STATIC) OR NOT WITH_STATIC)
   INSTALL(TARGETS shared_widgets LIBRARY DESTINATION ${NL_LIB_PREFIX} ARCHIVE DESTINATION ${NL_LIB_PREFIX} COMPONENT tools3d)
-ENDIF((WITH_INSTALL_LIBRARIES AND WITH_STATIC) OR NOT WITH_STATIC)
+ENDIF()

code/nel/tools/3d/tile_edit/CMakeLists.txt

@@ -15,6 +15,6 @@ ADD_DEFINITIONS(${MFC_DEFINITIONS})
 
 IF(WITH_PCH)
   ADD_NATIVE_PRECOMPILED_HEADER(tile_edit ${CMAKE_CURRENT_SOURCE_DIR}/stdafx.h ${CMAKE_CURRENT_SOURCE_DIR}/stdafx.cpp)
-ENDIF(WITH_PCH)
+ENDIF()
 
 INSTALL(TARGETS tile_edit RUNTIME DESTINATION ${NL_BIN_PREFIX} COMPONENT tools3d)

code/nel/tools/3d/zviewer/CMakeLists.txt

@@ -2,9 +2,9 @@ FILE(GLOB SRC *.cpp *.h)
 
 IF(WIN32)
   ADD_EXECUTABLE(zviewer WIN32 ${SRC} zviewer.rc)
-ELSE(WIN32)
+ELSE()
   ADD_EXECUTABLE(zviewer ${SRC})
-ENDIF(WIN32)
+ENDIF()
 
 ADD_DEFINITIONS(-DNL_ZVIEWER_CFG="\\"${NL_ETC_PREFIX}/\\"")
 

code/nel/tools/logic/CMakeLists.txt

@@ -1,3 +1,3 @@
 IF(MFC_FOUND)
   SUBDIRS(logic_editor_dll logic_editor_exe)
-ENDIF(MFC_FOUND)
+ENDIF()

code/nel/tools/logic/logic_editor_dll/CMakeLists.txt

@@ -13,6 +13,6 @@ NL_ADD_LIB_SUFFIX(logic_editor_dll)
 
 IF(WITH_PCH)
   ADD_NATIVE_PRECOMPILED_HEADER(logic_editor_dll ${CMAKE_CURRENT_SOURCE_DIR}/StdAfx.h ${CMAKE_CURRENT_SOURCE_DIR}/StdAfx.cpp)
-ENDIF(WITH_PCH)
+ENDIF()
 
 INSTALL(TARGETS logic_editor_dll LIBRARY DESTINATION ${NL_LIB_PREFIX} RUNTIME DESTINATION ${NL_BIN_PREFIX} ARCHIVE DESTINATION ${NL_LIB_PREFIX} COMPONENT toolsmisc)

code/nel/tools/logic/logic_editor_exe/CMakeLists.txt

@@ -8,6 +8,6 @@ NL_ADD_RUNTIME_FLAGS(logic_editor)
 
 IF(WITH_PCH)
   ADD_NATIVE_PRECOMPILED_HEADER(logic_editor ${CMAKE_CURRENT_SOURCE_DIR}/StdAfx.h ${CMAKE_CURRENT_SOURCE_DIR}/StdAfx.cpp)
-ENDIF(WITH_PCH)
+ENDIF()
 
 INSTALL(TARGETS logic_editor RUNTIME DESTINATION ${NL_BIN_PREFIX} COMPONENT toolsmisc)

code/nel/tools/misc/words_dic/CMakeLists.txt

@@ -10,6 +10,6 @@ ADD_DEFINITIONS(${MFC_DEFINITIONS})
 
 IF(WITH_PCH)
   ADD_NATIVE_PRECOMPILED_HEADER(words_dic ${CMAKE_CURRENT_SOURCE_DIR}/StdAfx.h ${CMAKE_CURRENT_SOURCE_DIR}/StdAfx.cpp)
-ENDIF(WITH_PCH)
+ENDIF()
 
 INSTALL(TARGETS words_dic RUNTIME DESTINATION ${NL_BIN_PREFIX} COMPONENT toolsmisc)

code/nelns/CMakeLists.txt

@@ -6,8 +6,8 @@ IF(WITH_NELNS_SERVER)
 	ADD_SUBDIRECTORY(naming_service)
 	ADD_SUBDIRECTORY(login_service)
 	ADD_SUBDIRECTORY(welcome_service)
-ENDIF(WITH_NELNS_SERVER)
+ENDIF()
 
 IF(WITH_NELNS_LOGIN_SYSTEM)
 	ADD_SUBDIRECTORY(login_system)
-ENDIF(WITH_NELNS_LOGIN_SYSTEM)
+ENDIF()

code/nelns/CMakePackaging.txt

@@ -34,10 +34,10 @@ SET(CPACK_SOURCE_PACKAGE_FILE_NAME "nelns-${NL_VERSION}")
 IF(WIN32)
   SET(CPACK_GENERATOR "NSIS")
   SET(CPACK_SOURCE_GENERATOR "ZIP")
-ELSE(WIN32)
+ELSE()
   SET(CPACK_GENERATOR "TGZ")
   SET(CPACK_SOURCE_GENERATOR "TGZ")
-ENDIF(WIN32)
+ENDIF()
 set(CPACK_SOURCE_IGNORE_FILES
         "~$"
         "\\\\.cvsignore$"
@@ -49,7 +49,7 @@ set(CPACK_SOURCE_IGNORE_FILES
 IF(WIN32)
   IF(NOT CMAKE_BUILD_TYPE STREQUAL "Release")
     SET(CMAKE_INSTALL_DEBUG_LIBRARIES TRUE)
-  ENDIF(NOT CMAKE_BUILD_TYPE STREQUAL "Release")
+  ENDIF()
 
   IF(WITH_QT)
     INCLUDE(${QT_USE_FILE})
@@ -58,15 +58,15 @@ IF(WIN32)
       "${QT_LIBRARY_DIR}/QtXml4.dll"
       "${QT_LIBRARY_DIR}/QtCore4.dll"
       DESTINATION bin)
-  ENDIF(WITH_QT)
+  ENDIF()
         
   # Only the tools require MFC.
   IF(BUILD_RYZOM_LAUNCHER)
     SET(CMAKE_INSTALL_MFC_LIBRARIES TRUE)
-  ENDIF(BUILD_RYZOM_LAUNCHER)
+  ENDIF()
   
   INCLUDE(InstallRequiredSystemLibraries)
-ENDIF(WIN32)
+ENDIF()
 
 INCLUDE(CPack)
 

code/nelns/login_system/CMakeLists.txt

@@ -1,9 +1,9 @@
 IF(WIN32)
   IF(BUILD_RYZOM_LAUNCHER)
 	ADD_SUBDIRECTORY(nel_launcher_windows_ext2)
-  ENDIF(BUILD_RYZOM_LAUNCHER)
+  ENDIF()
-ENDIF(WIN32)
+ENDIF()
 
 IF(WITH_QT)
   ADD_SUBDIRECTORY(nel_launcher_qt)
-ENDIF(WITH_QT)
+ENDIF()

code/nelns/login_system/nel_launcher_qt/CMakeLists.txt

@@ -34,6 +34,6 @@ ADD_DEFINITIONS(${QT_DEFINITIONS})
 INSTALL(TARGETS nel_launcher_qt RUNTIME DESTINATION bin COMPONENT launcher)
 IF(WIN32)
   INSTALL(FILES nel_launcher.cfg DESTINATION bin COMPONENT launcher)
-ELSE(WIN32)
+ELSE()
   INSTALL(FILES nel_launcher.cfg DESTINATION ${NL_ETC_PREFIX}/nelns COMPONENT launcher)
-ENDIF(WIN32)
+ENDIF()

code/nelns/login_system/nel_launcher_windows_ext2/CMakeLists.txt

@@ -3,7 +3,7 @@ FILE(GLOB SRC *.cpp *.h)
 ADD_EXECUTABLE(nel_launcher_ext2 WIN32 ${SRC} nel_launcher.rc)
 IF(CURL_FOUND)
   ADD_DEFINITIONS(-DUSE_CURL)
-ENDIF(CURL_FOUND)
+ENDIF()
 ADD_DEFINITIONS(-DNL_LAUNCHER_CFG="\\"${NL_ETC_PREFIX}/\\"")
 
 TARGET_LINK_LIBRARIES(nel_launcher_ext2
@@ -17,7 +17,7 @@ NL_ADD_RUNTIME_FLAGS(nel_launcher_ext2)
 
 IF(WITH_PCH)
   ADD_NATIVE_PRECOMPILED_HEADER(nel_launcher_ext2 ${CMAKE_CURRENT_SOURCE_DIR}/std_afx.h ${CMAKE_CURRENT_SOURCE_DIR}/std_afx.cpp)
-ENDIF(WITH_PCH)
+ENDIF()
 
 INSTALL(TARGETS nel_launcher_ext2 RUNTIME DESTINATION bin COMPONENT launcher)
 INSTALL(FILES nel_launcher.cfg DESTINATION ${NL_ETC_PREFIX} COMPONENT launcher)

code/ryzom/client/src/client_sheets/CMakeLists.txt

@@ -11,8 +11,8 @@ NL_ADD_LIB_SUFFIX(ryzom_clientsheets)
 
 IF(WITH_PCH)
   ADD_NATIVE_PRECOMPILED_HEADER(ryzom_clientsheets ${CMAKE_CURRENT_SOURCE_DIR}/stdpch.h ${CMAKE_CURRENT_SOURCE_DIR}/stdpch.cpp)
-ENDIF(WITH_PCH)
+ENDIF()
 
 IF((WITH_INSTALL_LIBRARIES AND WITH_STATIC) OR NOT WITH_STATIC)
   INSTALL(TARGETS ryzom_clientsheets LIBRARY DESTINATION ${RYZOM_LIB_PREFIX} ARCHIVE DESTINATION ${RYZOM_LIB_PREFIX} COMPONENT libraries)
-ENDIF((WITH_INSTALL_LIBRARIES AND WITH_STATIC) OR NOT WITH_STATIC)
+ENDIF()

code/ryzom/client/src/interface_v3/lua_ihm_ryzom.h

@@ -136,7 +136,7 @@ private:
 	static void	rawDebugInfo(const std::string &dbg);
 	// Dump callstack in the console
 	// Additionnally, if ClientCfg.LuaDebugInfoGotoButtonEnabled is set, then
-	// buttons will be created in fonr of eahc line to allow to goto the lua line that issued the message
+	// buttons will be created in front of each line to allow to go to the lua line that issued the message
 	// by using an external editor
 
 	static void	getCallStackAsString(int startStackLevel, std::string &result);

code/ryzom/client/src/login_patch.cpp

@@ -1416,6 +1416,7 @@ void CPatchManager::downloadFileWithCurl (const string &source, const string &de
 			// file not found, delete local file
 			throw Exception ("curl init failed");
 		}
+
 		curl_easy_setopt(curl, CURLOPT_NOPROGRESS, 0);
 		curl_easy_setopt(curl, CURLOPT_PROGRESSFUNCTION, downloadProgressFunc);
 		curl_easy_setopt(curl, CURLOPT_PROGRESSDATA, (void *) progress);
@@ -1427,12 +1428,15 @@ void CPatchManager::downloadFileWithCurl (const string &source, const string &de
 			setRWAccess(dest, false);
 			NLMISC::CFile::deleteFile(dest.c_str());
 		}
+
 		FILE *fp = nlfopen (dest, "wb");
+
 		if (fp == NULL)
 		{
 			curl_easy_setopt(curl, CURLOPT_PROGRESSDATA, NULL);
 			throw Exception ("Can't open file '%s' for writing: code=%d %s (error code 37)", dest.c_str (), errno, strerror(errno));
 		}
+
 		curl_easy_setopt(curl, CURLOPT_WRITEDATA, fp);
 		curl_easy_setopt(curl, CURLOPT_WRITEFUNCTION, fwrite);
 

code/ryzom/common/CMakeLists.txt

@@ -11,4 +11,4 @@ ADD_SUBDIRECTORY(src)
 
 IF(WITH_RYZOM_TOOLS)
   INSTALL(DIRECTORY "${CMAKE_CURRENT_SOURCE_DIR}/data_leveldesign" DESTINATION "${RYZOM_SHARE_PREFIX}")
-ENDIF(WITH_RYZOM_TOOLS)
+ENDIF()

code/ryzom/common/src/game_share/CMakeLists.txt

@@ -39,8 +39,8 @@ ADD_DEFINITIONS(${LIBXML2_DEFINITIONS})
 
 IF(WITH_PCH)
   ADD_NATIVE_PRECOMPILED_HEADER(ryzom_gameshare ${CMAKE_CURRENT_SOURCE_DIR}/stdpch.h ${CMAKE_CURRENT_SOURCE_DIR}/stdpch.cpp)
-ENDIF(WITH_PCH)
+ENDIF()
 
 IF((WITH_INSTALL_LIBRARIES AND WITH_STATIC) OR NOT WITH_STATIC)
   INSTALL(TARGETS ryzom_gameshare LIBRARY DESTINATION ${RYZOM_LIB_PREFIX} ARCHIVE DESTINATION ${RYZOM_LIB_PREFIX} COMPONENT libraries)
-ENDIF((WITH_INSTALL_LIBRARIES AND WITH_STATIC) OR NOT WITH_STATIC)
+ENDIF()

code/ryzom/common/src/game_share/server_edition_module.cpp

@@ -5320,7 +5320,6 @@ bool CServerEditionModule::hibernateSessionImpl  (TSessionId sessionId, std::str
 	//(*) Remove animation Session and kill AI Instance
 	if (animationSessionExist)
 	{
-
 		stopTest(sessionId);
 	}
 

code/ryzom/server/src/CMakeLists.txt

@@ -47,4 +47,4 @@ ADD_SUBDIRECTORY(general_utilities_service)
 #simulation_service
 #testing_tool_service
 
-ENDIF(WITH_RYZOM_SERVER)
+ENDIF()

code/ryzom/server/src/admin_modules/CMakeLists.txt

@@ -11,7 +11,7 @@ NL_ADD_LIB_SUFFIX(ryzom_adminmodules)
 
 IF(WITH_PCH)
   ADD_NATIVE_PRECOMPILED_HEADER(ryzom_adminmodules ${CMAKE_CURRENT_SOURCE_DIR}/stdpch.h ${CMAKE_CURRENT_SOURCE_DIR}/stdpch.cpp)
-ENDIF(WITH_PCH)
+ENDIF()
 
 IF((WITH_INSTALL_LIBRARIES AND WITH_STATIC) OR NOT WITH_STATIC)
   INSTALL(TARGETS ryzom_adminmodules LIBRARY DESTINATION ${RYZOM_LIB_PREFIX} ARCHIVE DESTINATION ${RYZOM_LIB_PREFIX} COMPONENT libraries)

code/ryzom/server/src/ai_service/CMakeLists.txt

@@ -32,7 +32,7 @@ NL_ADD_RUNTIME_FLAGS(ryzom_ai_service)
 
 IF(WITH_PCH)
   ADD_NATIVE_PRECOMPILED_HEADER(ryzom_ai_service ${CMAKE_CURRENT_SOURCE_DIR}/stdpch.h ${CMAKE_CURRENT_SOURCE_DIR}/stdpch.cpp)
-ENDIF(WITH_PCH)
+ENDIF()
 
 INSTALL(TARGETS ryzom_ai_service RUNTIME DESTINATION sbin COMPONENT services)
 

code/ryzom/server/src/ai_share/CMakeLists.txt

@@ -16,7 +16,7 @@ NL_ADD_LIB_SUFFIX(ryzom_aishare)
 
 IF(WITH_PCH)
   ADD_NATIVE_PRECOMPILED_HEADER(ryzom_aishare ${CMAKE_CURRENT_SOURCE_DIR}/stdpch.h ${CMAKE_CURRENT_SOURCE_DIR}/stdpch.cpp)
-ENDIF(WITH_PCH)
+ENDIF()
 
 IF(WITH_INSTALL_LIBRARIES)
   INSTALL(TARGETS ryzom_aishare LIBRARY DESTINATION ${RYZOM_LIB_PREFIX} ARCHIVE DESTINATION ${RYZOM_LIB_PREFIX} COMPONENT libraries)

code/ryzom/server/src/entities_game_service/CMakeLists.txt

@@ -110,10 +110,10 @@ ADD_DEFINITIONS(${LIBXML2_DEFINITIONS})
 
 IF(MSVC)
 	SET_TARGET_PROPERTIES(ryzom_entities_game_service PROPERTIES COMPILE_FLAGS "/bigobj")
-ENDIF(MSVC)
+ENDIF()
 
 IF(WITH_PCH AND NOT MINGW) # FIXME: PCH too large (> 130MB), crashes cc1plus under MinGW
   ADD_NATIVE_PRECOMPILED_HEADER(ryzom_entities_game_service ${CMAKE_CURRENT_SOURCE_DIR}/stdpch.h ${CMAKE_CURRENT_SOURCE_DIR}/stdpch.cpp)
-ENDIF(WITH_PCH AND NOT MINGW)
+ENDIF()
 
 INSTALL(TARGETS ryzom_entities_game_service RUNTIME DESTINATION sbin COMPONENT services)

code/ryzom/server/src/frontend_service/CMakeLists.txt

@@ -26,6 +26,6 @@ NL_ADD_RUNTIME_FLAGS(ryzom_frontend_service)
 
 IF(WITH_PCH)
   ADD_NATIVE_PRECOMPILED_HEADER(ryzom_frontend_service ${CMAKE_CURRENT_SOURCE_DIR}/stdpch.h ${CMAKE_CURRENT_SOURCE_DIR}/stdpch.cpp)
-ENDIF(WITH_PCH)
+ENDIF()
 
 INSTALL(TARGETS ryzom_frontend_service RUNTIME DESTINATION sbin COMPONENT services)

code/ryzom/server/src/gpm_service/CMakeLists.txt

@@ -19,6 +19,6 @@ NL_ADD_RUNTIME_FLAGS(ryzom_gpm_service)
 
 IF(WITH_PCH)
   ADD_NATIVE_PRECOMPILED_HEADER(ryzom_gpm_service ${CMAKE_CURRENT_SOURCE_DIR}/stdpch.h ${CMAKE_CURRENT_SOURCE_DIR}/stdpch.cpp)
-ENDIF(WITH_PCH)
+ENDIF()
 
 INSTALL(TARGETS ryzom_gpm_service RUNTIME DESTINATION sbin COMPONENT services)

code/ryzom/server/src/input_output_service/CMakeLists.txt

@@ -30,7 +30,7 @@ NL_ADD_RUNTIME_FLAGS(ryzom_ios_service)
 
 IF(WITH_PCH)
   ADD_NATIVE_PRECOMPILED_HEADER(ryzom_ios_service ${CMAKE_CURRENT_SOURCE_DIR}/stdpch.h ${CMAKE_CURRENT_SOURCE_DIR}/stdpch.cpp)
-ENDIF(WITH_PCH)
+ENDIF()
 
 INSTALL(TARGETS ryzom_ios_service RUNTIME DESTINATION sbin COMPONENT services)
 

code/ryzom/server/src/mail_forum_service/CMakeLists.txt

@@ -16,6 +16,6 @@ NL_ADD_RUNTIME_FLAGS(ryzom_mail_forum_service)
 
 IF(WITH_PCH)
   ADD_NATIVE_PRECOMPILED_HEADER(ryzom_mail_forum_service ${CMAKE_CURRENT_SOURCE_DIR}/stdpch.h ${CMAKE_CURRENT_SOURCE_DIR}/stdpch.cpp)
-ENDIF(WITH_PCH)
+ENDIF()
 
 INSTALL(TARGETS ryzom_mail_forum_service RUNTIME DESTINATION sbin COMPONENT services)

code/ryzom/server/src/monitor_service/CMakeLists.txt

@@ -16,7 +16,7 @@ NL_ADD_RUNTIME_FLAGS(ryzom_monitor_service)
 
 IF(WITH_PCH)
   ADD_NATIVE_PRECOMPILED_HEADER(ryzom_monitor_service ${CMAKE_CURRENT_SOURCE_DIR}/stdpch.h ${CMAKE_CURRENT_SOURCE_DIR}/stdpch.cpp)
-ENDIF(WITH_PCH)
+ENDIF()
 
 INSTALL(TARGETS ryzom_monitor_service RUNTIME DESTINATION sbin COMPONENT services)
 

code/ryzom/server/src/server_share/CMakeLists.txt

@@ -27,7 +27,7 @@ NL_ADD_LIB_SUFFIX(ryzom_servershare)
 
 IF(WITH_PCH)
   ADD_NATIVE_PRECOMPILED_HEADER(ryzom_servershare ${CMAKE_CURRENT_SOURCE_DIR}/stdpch.h ${CMAKE_CURRENT_SOURCE_DIR}/stdpch.cpp)
-ENDIF(WITH_PCH)
+ENDIF()
 
 IF(WITH_INSTALL_LIBRARIES)
   INSTALL(TARGETS ryzom_servershare LIBRARY DESTINATION ${RYZOM_LIB_PREFIX} ARCHIVE DESTINATION ${RYZOM_LIB_PREFIX} COMPONENT libraries)

code/ryzom/server/src/shard_unifier_service/CMakeLists.txt

@@ -19,10 +19,10 @@ ADD_DEFINITIONS(${LIBXML2_DEFINITIONS})
 
 IF(MSVC)
 	SET_TARGET_PROPERTIES(ryzom_shard_unifier_service PROPERTIES COMPILE_FLAGS "/bigobj")
-ENDIF(MSVC)
+ENDIF()
 
 IF(WITH_PCH)
   ADD_NATIVE_PRECOMPILED_HEADER(ryzom_shard_unifier_service ${CMAKE_CURRENT_SOURCE_DIR}/stdpch.h ${CMAKE_CURRENT_SOURCE_DIR}/stdpch.cpp)
-ENDIF(WITH_PCH)
+ENDIF()
 
 INSTALL(TARGETS ryzom_shard_unifier_service RUNTIME DESTINATION sbin COMPONENT services)

code/ryzom/tools/client/client_patcher/CMakeLists.txt

@@ -29,7 +29,7 @@ TARGET_LINK_LIBRARIES(ryzom_client_patcher
 IF(APPLE)
   FIND_LIBRARY(FOUNDATION_LIBRARY Foundation)
   TARGET_LINK_LIBRARIES(ryzom_client_patcher ${FOUNDATION_LIBRARY})
-ENDIF(APPLE)
+ENDIF()
 
 ADD_DEFINITIONS(${CURL_DEFINITIONS})
 
@@ -38,6 +38,6 @@ NL_ADD_RUNTIME_FLAGS(ryzom_client_patcher)
 
 IF(WITH_PCH)
   ADD_NATIVE_PRECOMPILED_HEADER(ryzom_client_patcher ${CMAKE_SOURCE_DIR}/ryzom/client/src/stdpch.h ${CMAKE_SOURCE_DIR}/ryzom/client/src/stdpch.cpp)
-ENDIF(WITH_PCH)
+ENDIF()
 
 INSTALL(TARGETS ryzom_client_patcher RUNTIME DESTINATION ${RYZOM_GAMES_PREFIX} COMPONENT client)

code/ryzom/tools/client/ryzom_installer/src/mainwindow.cpp

@@ -91,6 +91,7 @@ void CMainWindow::closeEvent(QCloseEvent *e)
 void CMainWindow::updateProfiles()
 {
 	profilesComboBox->setModel(new CProfilesModel(this));
+	profilesComboBox->setCurrentIndex(CConfigFile::getInstance()->getDefaultProfileIndex());
 }
 
 void CMainWindow::updateButtons()

code/ryzom/tools/leveldesign/CMakeLists.txt

@@ -5,7 +5,7 @@ IF(WITH_LIGO)
   ADD_SUBDIRECTORY(alias_synchronizer)
   ADD_SUBDIRECTORY(prim_export)
   ADD_SUBDIRECTORY(mission_compiler_lib)
-ENDIF(WITH_LIGO)
+ENDIF()
 ADD_SUBDIRECTORY(mp_generator)
 ADD_SUBDIRECTORY(named_items_2_csv)
 
@@ -13,27 +13,27 @@ IF(WIN32)
   IF(WITH_LIGO)
     ADD_SUBDIRECTORY(export)
     ADD_SUBDIRECTORY(world_editor)
-  ENDIF(WITH_LIGO)
+  ENDIF()
   IF(WITH_MFC)
     IF(WITH_LIGO)
       ADD_SUBDIRECTORY(mission_compiler_fe)
-    ENDIF(WITH_LIGO)
+    ENDIF()
     IF(WITH_GEORGES)
       ADD_SUBDIRECTORY(georges_dll)
       ADD_SUBDIRECTORY(georges_exe)
       IF(WITH_SOUND)
         ADD_SUBDIRECTORY(georges_plugin_sound)
-      ENDIF(WITH_SOUND)
+      ENDIF()
-    ENDIF(WITH_GEORGES)
+    ENDIF()
-  ENDIF(WITH_MFC)
+  ENDIF()
-ENDIF(WIN32)
+ENDIF()
 
 
 IF(WITH_QT)
   IF(WITH_GEORGES)
     ADD_SUBDIRECTORY(georges_editor_qt)
-  ENDIF(WITH_GEORGES)
+  ENDIF()
-ENDIF(WITH_QT)
+ENDIF()
 
 # folders not handled yet.
 #georges_convert

code/ryzom/tools/leveldesign/export/CMakeLists.txt

@@ -10,4 +10,4 @@ NL_ADD_LIB_SUFFIX(ryzom_export)
 
 IF((WITH_INSTALL_LIBRARIES AND WITH_STATIC) OR NOT WITH_STATIC)
   INSTALL(TARGETS ryzom_export LIBRARY DESTINATION ${RYZOM_LIB_PREFIX} ARCHIVE DESTINATION ${RYZOM_LIB_PREFIX} COMPONENT libraries)
-ENDIF((WITH_INSTALL_LIBRARIES AND WITH_STATIC) OR NOT WITH_STATIC)
+ENDIF()

code/ryzom/tools/leveldesign/georges_dll/CMakeLists.txt

@@ -15,6 +15,6 @@ ADD_DEFINITIONS(${MFC_DEFINITIONS} -DGEORGES_EXPORT)
 
 IF(WITH_PCH)
   ADD_NATIVE_PRECOMPILED_HEADER(georges_dll ${CMAKE_CURRENT_SOURCE_DIR}/stdafx.h ${CMAKE_CURRENT_SOURCE_DIR}/stdafx.cpp)
-ENDIF(WITH_PCH)
+ENDIF()
 
 INSTALL(TARGETS georges_dll LIBRARY DESTINATION ${RYZOM_LIB_PREFIX} RUNTIME DESTINATION ${RYZOM_BIN_PREFIX} ARCHIVE DESTINATION ${RYZOM_LIB_PREFIX} COMPONENT libraries)

code/ryzom/tools/leveldesign/georges_editor_qt/CMakeLists.txt

@@ -11,14 +11,14 @@ IF(WIN32)
 ELSEIF(APPLE)
   # TODO: under Mac OS X, don't install but copy files in application package
   SET(GEQT_DATA_DIR ".")
-ELSE(WIN32)
+ELSE()
   SET(GEQT_DATA_DIR ${RYZOM_SHARE_PREFIX}/georges_editor_qt/data)
 
   CONFIGURE_FILE(${CMAKE_CURRENT_SOURCE_DIR}/geqt_config.h.cmake ${CMAKE_CURRENT_BINARY_DIR}/geqt_config.h)
   INCLUDE_DIRECTORIES(${CMAKE_CURRENT_BINARY_DIR})
 
   ADD_DEFINITIONS(-DHAVE_GEQT_CONFIG_H)
-ENDIF(WIN32)
+ENDIF()
 
 ADD_SUBDIRECTORY(src)
 

code/ryzom/tools/leveldesign/mission_compiler_fe/CMakeLists.txt

@@ -11,6 +11,6 @@ NL_ADD_RUNTIME_FLAGS(ryzom_mission_compiler_fe)
 
 IF(WITH_PCH)
   ADD_NATIVE_PRECOMPILED_HEADER(ryzom_mission_compiler_fe ${CMAKE_CURRENT_SOURCE_DIR}/StdAfx.h ${CMAKE_CURRENT_SOURCE_DIR}/StdAfx.cpp)
-ENDIF(WITH_PCH)
+ENDIF()
 
 INSTALL(TARGETS ryzom_mission_compiler_fe RUNTIME DESTINATION ${RYZOM_BIN_PREFIX} COMPONENT tools)

code/ryzom/tools/leveldesign/mission_compiler_lib/CMakeLists.txt

@@ -16,7 +16,7 @@ NL_ADD_LIB_SUFFIX(ryzom_mission_compiler_lib)
 
 IF((WITH_INSTALL_LIBRARIES AND WITH_STATIC) OR NOT WITH_STATIC)
   INSTALL(TARGETS ryzom_mission_compiler_lib LIBRARY DESTINATION ${RYZOM_LIB_PREFIX} ARCHIVE DESTINATION ${RYZOM_LIB_PREFIX} COMPONENT libraries)
-ENDIF((WITH_INSTALL_LIBRARIES AND WITH_STATIC) OR NOT WITH_STATIC)
+ENDIF()
 
 FILE(GLOB EXESRC main.cpp)
   

code/ryzom/tools/leveldesign/world_editor/CMakeLists.txt

@@ -8,7 +8,7 @@ IF(WITH_MFC)
   ADD_SUBDIRECTORY(world_editor_primitive_plugin)
   ADD_SUBDIRECTORY(world_editor_shard_monitor_plugin)
   ADD_SUBDIRECTORY(world_editor_sound_plugin)
-ENDIF(WITH_MFC)
+ENDIF()
 
 # This is an old plugin and is deprecated. It doesn't even compile anymore.
 #ADD_SUBDIRECTORY(world_editor_plugin)

code/ryzom/tools/leveldesign/world_editor/land_export_lib/CMakeLists.txt

@@ -10,4 +10,4 @@ NL_ADD_LIB_SUFFIX(ryzom_landexport)
 
 IF((WITH_INSTALL_LIBRARIES AND WITH_STATIC) OR NOT WITH_STATIC)
   INSTALL(TARGETS ryzom_landexport LIBRARY DESTINATION ${RYZOM_LIB_PREFIX} ARCHIVE DESTINATION ${RYZOM_LIB_PREFIX} COMPONENT libraries)
-ENDIF((WITH_INSTALL_LIBRARIES AND WITH_STATIC) OR NOT WITH_STATIC)
+ENDIF()

code/ryzom/tools/leveldesign/world_editor/world_editor/CMakeLists.txt

@@ -24,6 +24,6 @@ NL_ADD_RUNTIME_FLAGS(world_editor)
 
 IF(WITH_PCH)
   ADD_NATIVE_PRECOMPILED_HEADER(world_editor ${CMAKE_CURRENT_SOURCE_DIR}/stdafx.h ${CMAKE_CURRENT_SOURCE_DIR}/stdafx.cpp)
-ENDIF(WITH_PCH)
+ENDIF()
 
 INSTALL(TARGETS world_editor RUNTIME DESTINATION ${RYZOM_BIN_PREFIX} COMPONENT tools)

code/ryzom/tools/leveldesign/world_editor/world_editor_plugin/CMakeLists.txt

@@ -17,7 +17,7 @@ ADD_DEFINITIONS(${MFC_DEFINITIONS} -DOBJECT_VIEWER_LIB_EXPORTS)
 
 IF(WITH_PCH)
   ADD_NATIVE_PRECOMPILED_HEADER(world_editor_plugin ${CMAKE_CURRENT_SOURCE_DIR}/StdAfx.h ${CMAKE_CURRENT_SOURCE_DIR}/StdAfx.cpp)
-ENDIF(WITH_PCH)
+ENDIF()
 
 INSTALL(TARGETS world_editor_plugin LIBRARY DESTINATION ${RYZOM_LIB_PREFIX} RUNTIME DESTINATION ${RYZOM_BIN_PREFIX} ARCHIVE DESTINATION ${RYZOM_LIB_PREFIX} COMPONENT tools3d)
 INSTALL(FILES WorldEditorPlugin.cfg DESTINATION ${RYZOM_ETC_PREFIX} COMPONENT tools3d)

code/ryzom/tools/server/build_world_packed_col/CMakeLists.txt

@@ -16,6 +16,6 @@ NL_ADD_RUNTIME_FLAGS(build_world_packed_col)
 
 IF(WITH_PCH)
   ADD_NATIVE_PRECOMPILED_HEADER(build_world_packed_col ${CMAKE_CURRENT_SOURCE_DIR}/std_header.h ${CMAKE_CURRENT_SOURCE_DIR}/std_header.cpp)
-ENDIF(WITH_PCH)
+ENDIF()
 
 INSTALL(TARGETS build_world_packed_col RUNTIME DESTINATION ${RYZOM_BIN_PREFIX} COMPONENT tools)

code/ryzom/tools/sheet_random_generator/CMakeLists.txt

@@ -11,6 +11,6 @@ NL_ADD_RUNTIME_FLAGS(sheet_random_generator)
 
 IF(WITH_PCH)
   ADD_NATIVE_PRECOMPILED_HEADER(sheet_random_generator ${CMAKE_CURRENT_SOURCE_DIR}/StdAfx.h ${CMAKE_CURRENT_SOURCE_DIR}/StdAfx.cpp)
-ENDIF(WITH_PCH)
+ENDIF()
 
 INSTALL(TARGETS sheet_random_generator RUNTIME DESTINATION ${RYZOM_BIN_PREFIX} COMPONENT tools)

code/ryzom/tools/sheets_packer/CMakeLists.txt

@@ -23,7 +23,7 @@ NL_ADD_RUNTIME_FLAGS(sheets_packer)
 
 IF(WITH_PCH)
   ADD_NATIVE_PRECOMPILED_HEADER(sheets_packer ${CMAKE_CURRENT_SOURCE_DIR}/stdpch.h ${CMAKE_CURRENT_SOURCE_DIR}/stdpch.cpp)
-ENDIF(WITH_PCH)
+ENDIF()
 
 INSTALL(TARGETS sheets_packer RUNTIME DESTINATION ${RYZOM_BIN_PREFIX} COMPONENT tools)
 INSTALL(FILES sheets_packer.cfg DESTINATION ${RYZOM_SHARE_PREFIX} COMPONENT tools)

code/ryzom/tools/sheets_packer_shard/CMakeLists.txt

@@ -32,6 +32,6 @@ ADD_DEFINITIONS(-DNO_AI_COMP)
 
 IF(MSVC)
 	SET_TARGET_PROPERTIES(sheets_packer_shard PROPERTIES COMPILE_FLAGS "/bigobj")
-ENDIF(MSVC)
+ENDIF()
 
 INSTALL(TARGETS sheets_packer_shard RUNTIME DESTINATION ${RYZOM_BIN_PREFIX} COMPONENT tools)

code/snowballs2/CMakeLists.txt

@@ -1,8 +1,8 @@
 IF(WIN32)
   SET(SNOWBALLS_CONFIG_FILE "." CACHE FILEPATH "Snowballs config file location")
-ELSE(WIN32)
+ELSE()
   SET(SNOWBALLS_CONFIG_FILE "${NL_ETC_PREFIX}/snowballs" CACHE FILEPATH "Snowballs config file location")
-ENDIF(WIN32)
+ENDIF()
 SET(SNOWBALLS_DATA_FILE "${NL_SHARE_PREFIX}/games/snowballs" CACHE FILEPATH "Snowballs data file location")
 SET(SNOWBALLS_LOG_FILE "${NL_LOG_PREFIX}/snowballs" CACHE FILEPATH "Snowballs log file location")
 
@@ -19,13 +19,13 @@ ADD_DEFINITIONS(-DSNOWBALLS_CONFIG="${SNOWBALLS_CONFIG_FILE}/" -DSNOWBALLS_STATE
 
 IF(WITH_SNOWBALLS_CLIENT)
   ADD_SUBDIRECTORY(client)
-ENDIF(WITH_SNOWBALLS_CLIENT)
+ENDIF()
 
 IF(WITH_SNOWBALLS_SERVER)
   ADD_SUBDIRECTORY(server)
-ENDIF(WITH_SNOWBALLS_SERVER)
+ENDIF()
 
 IF(WITH_SNOWBALLS_PACKAGE)
   INCLUDE(CMakePackaging.txt)
-ENDIF(WITH_SNOWBALLS_PACKAGE)
+ENDIF()