From f745f82455943a46b1b18ed0d1881f01b650679c Mon Sep 17 00:00:00 2001
From: kervala <none@none>
Date: Fri, 26 Dec 2014 13:43:20 +0100
Subject: [PATCH] Changed: Give priority to Luabind library filenames with
 specific Lua version

--HG--
branch : develop
---
 code/CMakeModules/FindLuabind.cmake | 42 ++++++++++++++++++++++++++---
 1 file changed, 38 insertions(+), 4 deletions(-)

diff --git a/code/CMakeModules/FindLuabind.cmake b/code/CMakeModules/FindLuabind.cmake
index 14f67ce44..73255077a 100644
--- a/code/CMakeModules/FindLuabind.cmake
+++ b/code/CMakeModules/FindLuabind.cmake
@@ -69,14 +69,48 @@ FIND_PATH(LUABIND_INCLUDE_DIR
   /opt/include
 )
 
-SET(LIBRARY_NAME_RELEASE luabind libluabind)
-SET(LIBRARY_NAME_DEBUG luabind_d luabindd libluabind_d libluabindd)
+SET(LIBRARY_NAME_RELEASE)
+SET(LIBRARY_NAME_DEBUG)
+
+IF(WITH_LUA52)
+  IF(WITH_STLPORT)
+    LIST(APPEND LIBRARY_NAME_RELEASE luabind_stlport_lua52)
+    LIST(APPEND LIBRARY_NAME_DEBUG luabind_stlport_lua52d)
+  ENDIF(WITH_STLPORT)
+
+  LIST(APPEND LIBRARY_NAME_RELEASE luabind_lua52)
+  LIST(APPEND LIBRARY_NAME_DEBUG luabind_lua52d)
+ENDIF()
+
+IF(WITH_LUA51)
+  IF(WITH_STLPORT)
+    LIST(APPEND LIBRARY_NAME_RELEASE luabind_stlport_lua51)
+    LIST(APPEND LIBRARY_NAME_DEBUG luabind_stlport_lua51d)
+  ENDIF(WITH_STLPORT)
+
+  LIST(APPEND LIBRARY_NAME_RELEASE luabind_lua51)
+  LIST(APPEND LIBRARY_NAME_DEBUG luabind_lua51d)
+ENDIF()
+
+IF(WITH_LUA50)
+  IF(WITH_STLPORT)
+    LIST(APPEND LIBRARY_NAME_RELEASE luabind_stlport_lua50)
+    LIST(APPEND LIBRARY_NAME_DEBUG luabind_stlport_lua50d)
+  ENDIF(WITH_STLPORT)
+
+  LIST(APPEND LIBRARY_NAME_RELEASE luabind_lua50)
+  LIST(APPEND LIBRARY_NAME_DEBUG luabind_lua50d)
+ENDIF()
 
 IF(WITH_STLPORT)
-  SET(LIBRARY_NAME_RELEASE luabind_stlport ${LIBRARY_NAME_RELEASE})
-  SET(LIBRARY_NAME_DEBUG luabind_stlportd ${LIBRARY_NAME_DEBUG})
+  LIST(APPEND LIBRARY_NAME_RELEASE luabind_stlport)
+  LIST(APPEND LIBRARY_NAME_DEBUG luabind_stlportd)
 ENDIF(WITH_STLPORT)
 
+# generic libraries names
+LIST(APPEND LIBRARY_NAME_RELEASE luabind libluabind)
+LIST(APPEND LIBRARY_NAME_DEBUG luabind_d luabindd libluabind_d libluabindd)
+
 FIND_LIBRARY(LUABIND_LIBRARY_RELEASE
   NAMES ${LIBRARY_NAME_RELEASE}
   PATHS