Planet
navi homePPSaboutscreenshotsdownloaddevelopmentforum

Changeset 2338 for code


Ignore:
Timestamp:
Dec 3, 2008, 6:37:31 PM (16 years ago)
Author:
adrfried
Message:

even more lua fixes

File:
1 edited

Legend:

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

    r2335 r2338  
    6363
    6464# Require Lua 5.0 or 5.1
    65 FIND_PACKAGE(Lua50 REQUIRED)
    66 #IF(NOT LUA50_FOUND)
    67 #    FIND_PACKAGE(Lua51 REQUIRED)
    68 #ENDIF(NOT LUA50_FOUND)
    69 # Determine Lua version
     65FIND_PACKAGE(Lua50 QUIET)
     66IF(NOT LUA50_FOUND)
     67    # Remove variables set by Lua50 and try with Lua51
     68    SET(LUA_INCLUDE_DIR "")
     69    SET(LUA_LIBRARY_lua "")
     70    SET(LUA_LIBRARY_lualib "")
     71    SET(LUA_LIBRARIES "")
     72    FIND_PACKAGE(Lua51 REQUIRED)
     73ENDIF(NOT LUA50_FOUND)
     74# Determine Lua version (Lua50 may also find Lua51)
    7075FILE(STRINGS "${LUA_INCLUDE_DIR}/lua.h" LUA_VERSION REGEX "LUA_VERSION")
    7176STRING(REGEX REPLACE "^.*\"Lua (.*)\".*$" "\\1" LUA_VERSION "${LUA_VERSION}")
Note: See TracChangeset for help on using the changeset viewer.