Planet
navi homePPSaboutscreenshotsdownloaddevelopmentforum

Changeset 2335


Ignore:
Timestamp:
Dec 3, 2008, 5:56:04 PM (16 years ago)
Author:
adrfried
Message:

lua handling fixed again

Location:
code/branches/buildsystem
Files:
2 edited

Legend:

Unmodified
Added
Removed
  • code/branches/buildsystem/CMakeLists.txt

    r2325 r2335  
    6363
    6464# Require Lua 5.0 or 5.1
    65 FIND_PACKAGE(Lua50 QUIET)
    66 IF(NOT LUA50_FOUND)
    67     FIND_PACKAGE(Lua51 REQUIRED)
    68 ENDIF(NOT LUA50_FOUND)
     65FIND_PACKAGE(Lua50 REQUIRED)
     66#IF(NOT LUA50_FOUND)
     67#    FIND_PACKAGE(Lua51 REQUIRED)
     68#ENDIF(NOT LUA50_FOUND)
     69# Determine Lua version
     70FILE(STRINGS "${LUA_INCLUDE_DIR}/lua.h" LUA_VERSION REGEX "LUA_VERSION")
     71STRING(REGEX REPLACE "^.*\"Lua (.*)\".*$" "\\1" LUA_VERSION "${LUA_VERSION}")
    6972
    7073# Don't require the whole tcl rat tail
  • code/branches/buildsystem/src/tolua/CMakeLists.txt

    r2326 r2335  
    1818TARGET_LINK_LIBRARIES(toluaexe_orxonox tolualib_orxonox ${LUA_LIBRARIES})
    1919
    20 # Determine Lua version and set appropriate pack file
    21 IF(LUA50_FOUND)
     20IF(${LUA_VERSION} VERSION_LESS 5.1)
    2221  SET(TOLUA_ALL_PACK all-5.0.lua)
    23 ELSE(LUA50_FOUND)
     22ELSE(${LUA_VERSION} VERSION_LESS 5.1)
    2423  SET(TOLUA_ALL_PACK all-5.1.lua)
    25 ENDIF(LUA50_FOUND)
     24ENDIF(${LUA_VERSION} VERSION_LESS 5.1)
    2625
    2726SET(TOLUA_PARSER_SOURCE "${CMAKE_CURRENT_SOURCE_DIR}/${TOLUA_ALL_PACK}" PARENT_SCOPE)
Note: See TracChangeset for help on using the changeset viewer.