Changeset 2326 for code/branches/buildsystem

Timestamp:

Dec 3, 2008, 4:30:12 PM (16 years ago)

Author:

adrfried

Message:

fix tolua compat handling

Location:

code/branches/buildsystem

Files:

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

code/branches/buildsystem/TODO_buildsystem

@@ -1 @@
-- Detect lua version and modify all.lua accordingly (do not include compat-5.1 for lua 5.0)
 - Detect ceguilua version other than with the variable from the pkg config file. It might not exist everywhere.

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

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