Changeset 2615 for code

Timestamp:

Jan 29, 2009, 10:45:56 PM (16 years ago)

Author:

rgrieder

Message:

Added FindLua.cmake:

• Finds both version 5.0 and 5.1, but prefers 5.1
• Regards version arguments (5.1.3 EXACT will only match 5.1.3, whereas 5 EXACT will match all Lua 5 versions)
• Checks the header for the right version always
• Also finds debug libraries

As you might know, there are already two scripts in the CMake module path: FindLua50.cmake and FindLua51.cmake. Unfortunately it would require writing a lot of hacky extra code to meet our needs with Lua versions. So I decided to write a whole new find script that should be able to all we need.

Location:

code/branches/buildsystem2/cmake

Files:

• FindLua.cmake (added)
• LibraryConfig.cmake (modified) (1 diff)

code/branches/buildsystem2/cmake/LibraryConfig.cmake

@@ -23 +23 @@
 FIND_PACKAGE(DirectX REQUIRED)
 
-# Require Lua 5.0 or 5.1
-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}")
+##### Lua #####
+IF(CEGUILUA_USE_EXTERNAL_LIBRARY)
+  COMPARE_VERSION_STRINGS(${CEGUI_VERSION} "0.6" _version_comparison)
+  IF(version_comparison LESS 0)
+    SET(LUA_VERSION_REQUEST 5.0)
+  ELSE(version_comparison LESS 0)
+    SET(LUA_VERSION_REQUEST 5.1)
+  ENDIF(version_comparison LESS 0)
+ELSE(CEGUILUA_USE_EXTERNAL_LIBRARY)
+  SET(LUA_VERSION_REQUEST 5)
+ENDIF(CEGUILUA_USE_EXTERNAL_LIBRARY)
+FIND_PACKAGE(Lua ${LUA_VERSION_REQUEST} EXACT REQUIRED)
 
 # QUIET: Don't require the whole tcl rat tail