Merge with develop

--HG--
branch : compatibility-develop

code/CMakeModules/FindLuabind.cmake

@@ -9,6 +9,21 @@ MACRO(FIND_CORRECT_LUA_VERSION)
   IF(LUABIND_LIBRARY_RELEASE MATCHES "\\.so")
     INCLUDE(CheckDepends)
 
+    # check for Lua 5.3
+    SET(LUA53_LIBRARY "liblua5.3")
+    CHECK_LINKED_LIBRARY(LUABIND_LIBRARY_RELEASE LUA53_LIBRARY LUALIB_FOUND)
+
+    IF(NOT LUALIB_FOUND)
+      # fedora (v22+)
+      SET(LUA53_LIBRARY "liblua-5.3")
+      CHECK_LINKED_LIBRARY(LUABIND_LIBRARY_RELEASE LUA53_LIBRARY LUALIB_FOUND)
+    ENDIF()
+
+    IF(LUALIB_FOUND)
+      MESSAGE(STATUS "Luabind is using Lua 5.3")
+      FIND_PACKAGE(Lua53 REQUIRED)
+    ELSE()
+      # check for Lua 5.2
       SET(LUA52_LIBRARY "liblua5.2")
       CHECK_LINKED_LIBRARY(LUABIND_LIBRARY_RELEASE LUA52_LIBRARY LUALIB_FOUND)
 
@@ -16,31 +31,34 @@ MACRO(FIND_CORRECT_LUA_VERSION)
         # fedora (v20)
         SET(LUA52_LIBRARY "liblua-5.2")
         CHECK_LINKED_LIBRARY(LUABIND_LIBRARY_RELEASE LUA52_LIBRARY LUALIB_FOUND)
-    ENDIF(NOT LUALIB_FOUND)
+      ENDIF()
 
       IF(LUALIB_FOUND)
         MESSAGE(STATUS "Luabind is using Lua 5.2")
         FIND_PACKAGE(Lua52 REQUIRED)
-    ELSE(LUALIB_FOUND)
+      ELSE()
+        # check for Lua 5.1
         SET(LUA51_LIBRARY "liblua5.1")
         CHECK_LINKED_LIBRARY(LUABIND_LIBRARY_RELEASE LUA51_LIBRARY LUALIB_FOUND)
 
         IF(LUALIB_FOUND)
           MESSAGE(STATUS "Luabind is using Lua 5.1")
           FIND_PACKAGE(Lua51 REQUIRED)
-      ELSE(LUALIB_FOUND)
+        ELSE()
+          # check for Lua 5.0
           SET(LUA50_LIBRARY "liblua5.0")
           CHECK_LINKED_LIBRARY(LUABIND_LIBRARY_RELEASE LUA50_LIBRARY LUALIB_FOUND)
 
           IF(LUALIB_FOUND)
             MESSAGE(STATUS "Luabind is using Lua 5.0")
             FIND_PACKAGE(Lua50 REQUIRED)
-        ELSE(LUALIB_FOUND)
+          ELSE()
             MESSAGE(FATAL_ERROR "Can't determine Lua version used by Luabind")
-        ENDIF(LUALIB_FOUND)
+          ENDIF()
-      ENDIF(LUALIB_FOUND)
+        ENDIF()
-    ENDIF(LUALIB_FOUND)
+      ENDIF()
-  ELSE(LUABIND_LIBRARY_RELEASE MATCHES "\\.so")
+    ENDIF()
+  ELSE()
     # TODO: find a way to detect Lua version
     IF(WITH_LUA53)
       FIND_PACKAGE(Lua53 REQUIRED)