Merge with develop

--HG--
branch : compatibility-develop

code/CMakeModules/FindExternal.cmake

@@ -8,7 +8,7 @@
 # EXTERNAL_FOUND        - True if the external libraries are available
 
 SET(EXTERNAL_TEMP_PATH ${CMAKE_CURRENT_SOURCE_DIR}/external ${CMAKE_CURRENT_SOURCE_DIR}/../external ${CMAKE_CURRENT_SOURCE_DIR}/3rdParty ${CMAKE_CURRENT_SOURCE_DIR}/../3rdParty ${EXTERNAL_PATH})
-SET(EXTERNAL_TEMP_FILE "include/wwwconf.h")
+SET(EXTERNAL_TEMP_FILE "include/zlib.h")
 SET(EXTERNAL_NAME "external")
 
 # If using STLport preprend external_stlport
@@ -38,35 +38,35 @@ IF(EXTERNAL_PATH)
   # Using 32 or 64 bits binaries
   IF(TARGET_X64 AND WIN32)
     SET(EXTERNAL_BINARY_PATH "${EXTERNAL_PATH}/bin64")
-  ELSE(TARGET_X64 AND WIN32)
+  ELSE()
     SET(EXTERNAL_BINARY_PATH "${EXTERNAL_PATH}/bin")
-  ENDIF(TARGET_X64 AND WIN32)
+  ENDIF()
 
   # Using 32 or 64 bits libraries
   IF(TARGET_X64 AND WIN32)
     SET(EXTERNAL_LIBRARY_PATH "${EXTERNAL_PATH}/lib64")
-  ELSE(TARGET_X64 AND WIN32)
+  ELSE()
     SET(EXTERNAL_LIBRARY_PATH "${EXTERNAL_PATH}/lib")
-  ENDIF(TARGET_X64 AND WIN32)
+  ENDIF()
 
   SET(CMAKE_INCLUDE_PATH "${EXTERNAL_INCLUDE_PATH};${CMAKE_INCLUDE_PATH}")
   # Stupid hack for FindOpenAL.cmake
   SET(CMAKE_INCLUDE_PATH "${EXTERNAL_PATH};${CMAKE_INCLUDE_PATH}")
   SET(CMAKE_LIBRARY_PATH "${EXTERNAL_LIBRARY_PATH};${CMAKE_LIBRARY_PATH}")
-ENDIF(EXTERNAL_PATH)
+ENDIF()
 
 IF(EXTERNAL_FOUND)
   IF(NOT External_FIND_QUIETLY)
     MESSAGE(STATUS "Found ${EXTERNAL_NAME}: ${EXTERNAL_PATH}")
-  ENDIF(NOT External_FIND_QUIETLY)
+  ENDIF()
 ELSE(EXTERNAL_FOUND)
   IF(External_FIND_REQUIRED)
     MESSAGE(FATAL_ERROR "Unable to find ${EXTERNAL_NAME}!")
-  ELSE(External_FIND_REQUIRED)
+  ELSE()
     IF(NOT External_FIND_QUIETLY)
       MESSAGE(STATUS "Warning: Unable to find ${EXTERNAL_NAME}!")
-    ENDIF(NOT External_FIND_QUIETLY)
-  ENDIF(External_FIND_REQUIRED)
-ENDIF(EXTERNAL_FOUND)
+    ENDIF()
+  ENDIF()
+ENDIF()
 
 MARK_AS_ADVANCED(EXTERNAL_INCLUDE_PATH EXTERNAL_BINARY_PATH EXTERNAL_LIBRARY_PATH)