Changeset 2338

Timestamp:

Dec 3, 2008, 6:37:31 PM (16 years ago)

Author:

adrfried

Message:

even more lua fixes

File:

• code/branches/buildsystem/CMakeLists.txt (modified) (1 diff)

code/branches/buildsystem/CMakeLists.txt

@@ -63 +63 @@
 
 # Require Lua 5.0 or 5.1
-FIND_PACKAGE(Lua50 REQUIRED)
-#IF(NOT LUA50_FOUND)
-#    FIND_PACKAGE(Lua51 REQUIRED)
-#ENDIF(NOT LUA50_FOUND)
-# Determine Lua version
+FIND_PACKAGE(Lua50 QUIET)
+IF(NOT LUA50_FOUND)
+    # Remove variables set by Lua50 and try with Lua51
+    SET(LUA_INCLUDE_DIR "")
+    SET(LUA_LIBRARY_lua "")
+    SET(LUA_LIBRARY_lualib "")
+    SET(LUA_LIBRARIES "")
+    FIND_PACKAGE(Lua51 REQUIRED)
+ENDIF(NOT LUA50_FOUND)
+# Determine Lua version (Lua50 may also find Lua51)
 FILE(STRINGS "${LUA_INCLUDE_DIR}/lua.h" LUA_VERSION REGEX "LUA_VERSION")
 STRING(REGEX REPLACE "^.*\"Lua (.*)\".*$" "\\1" LUA_VERSION "${LUA_VERSION}")