Changeset 2335

Timestamp:

Dec 3, 2008, 5:56:04 PM (16 years ago)

Author:

adrfried

Message:

lua handling fixed again

Location:

code/branches/buildsystem

Files:

• CMakeLists.txt (modified) (1 diff)
• src/tolua/CMakeLists.txt (modified) (1 diff)

code/branches/buildsystem/CMakeLists.txt

@@ -63 +63 @@
 
 # Require Lua 5.0 or 5.1
-FIND_PACKAGE(Lua50 QUIET)
-IF(NOT LUA50_FOUND)
-    FIND_PACKAGE(Lua51 REQUIRED)
-ENDIF(NOT LUA50_FOUND)
+FIND_PACKAGE(Lua50 REQUIRED)
+#IF(NOT LUA50_FOUND)
+#    FIND_PACKAGE(Lua51 REQUIRED)
+#ENDIF(NOT LUA50_FOUND)
+# Determine Lua version
+FILE(STRINGS "${LUA_INCLUDE_DIR}/lua.h" LUA_VERSION REGEX "LUA_VERSION")
+STRING(REGEX REPLACE "^.*\"Lua (.*)\".*$" "\\1" LUA_VERSION "${LUA_VERSION}")
 
 # Don't require the whole tcl rat tail

code/branches/buildsystem/src/tolua/CMakeLists.txt

@@ -18 +18 @@
 TARGET_LINK_LIBRARIES(toluaexe_orxonox tolualib_orxonox ${LUA_LIBRARIES})
 
-# Determine Lua version and set appropriate pack file
-IF(LUA50_FOUND)
+IF(${LUA_VERSION} VERSION_LESS 5.1)
   SET(TOLUA_ALL_PACK all-5.0.lua)
-ELSE(LUA50_FOUND)
+ELSE(${LUA_VERSION} VERSION_LESS 5.1)
   SET(TOLUA_ALL_PACK all-5.1.lua)
-ENDIF(LUA50_FOUND)
+ENDIF(${LUA_VERSION} VERSION_LESS 5.1)
 
 SET(TOLUA_PARSER_SOURCE "${CMAKE_CURRENT_SOURCE_DIR}/${TOLUA_ALL_PACK}" PARENT_SCOPE)