[Orxonox-commit 3252] r7943 - code/branches/kicklib/cmake

[rgrieder at orxonox.net]

Author: rgrieder
Date: 2011-02-21 02:42:49 +0100 (Mon, 21 Feb 2011)
New Revision: 7943

Modified:
   code/branches/kicklib/cmake/LibraryConfig.cmake
Log:
Dropped support for Lua 5.0 in favour of v5.1. It also seems that all major Linux distributions (Debian, Ubuntu, Gentoo, Arch Linux and Fedora) compile CEGUI with Lua 5.1

Modified: code/branches/kicklib/cmake/LibraryConfig.cmake
===================================================================
--- code/branches/kicklib/cmake/LibraryConfig.cmake	2011-02-21 01:37:56 UTC (rev 7942)
+++ code/branches/kicklib/cmake/LibraryConfig.cmake	2011-02-21 01:42:49 UTC (rev 7943)
@@ -92,8 +92,9 @@
 ############### Library finding #################
 # Performs the search and sets the variables    #
 
-FIND_PACKAGE(OGRE  1.4       REQUIRED)
-#FIND_PACKAGE(ENet  1.1       REQUIRED)
+FIND_PACKAGE(OGRE     1.4    REQUIRED)
+#FIND_PACKAGE(ENet     1.1    REQUIRED)
+FIND_PACKAGE(Lua      5.1    REQUIRED)
 FIND_PACKAGE(Ogg             REQUIRED)
 FIND_PACKAGE(Vorbis          REQUIRED)
 FIND_PACKAGE(ALUT            REQUIRED)
@@ -111,18 +112,10 @@
 # However there is a small issue with that: Both CEGUILua and Orxonox use
 # Lua library functions on the same objects. And it turns out that in this case
 # the linked library must be EXACTLY the same.
-# That means for us we have to find the Lua library that CEGUI was
-# linked against if we don't use a dependency package.
-
+# Since Lua v5.1 has been out for a long while, this does not seem to be a
+# problem anymore, at least as long as Lua 5.2 is not released.
 FIND_PACKAGE(CEGUI 0.5 REQUIRED)
 
-##### Lua #####
-IF(NOT LUA_VERSION_REQUIREMENT)
-  FIND_PACKAGE(Lua 5 REQUIRED)
-ELSE()
-  FIND_PACKAGE(Lua ${LUA_VERSION_REQUIREMENT} EXACT REQUIRED)
-ENDIF()
-
 ##### OpenAL #####
 FIND_PACKAGE(OpenAL REQUIRED)
 # Also use parent include dir (without AL/) for ALUT