[Orxonox-commit 3253] r7944 - in code/branches/kicklib: cmake cmake/tools src src/external/tolua src/libraries/core
rgrieder at orxonox.net
rgrieder at orxonox.net
Mon Feb 21 03:47:04 CET 2011
Author: rgrieder
Date: 2011-02-21 03:47:04 +0100 (Mon, 21 Feb 2011)
New Revision: 7944
Added:
code/branches/kicklib/cmake/tools/FindLua5.1.cmake
Removed:
code/branches/kicklib/cmake/tools/FindLua.cmake
code/branches/kicklib/src/external/tolua/all-5.0.lua
Modified:
code/branches/kicklib/cmake/LibraryConfig.cmake
code/branches/kicklib/cmake/LibraryConfigTardis.cmake
code/branches/kicklib/cmake/PackageConfig.cmake
code/branches/kicklib/src/CMakeLists.txt
code/branches/kicklib/src/external/tolua/CMakeLists.txt
code/branches/kicklib/src/libraries/core/CMakeLists.txt
Log:
Renamed Lua library to "Lua5.1" because that's also what the official Linux repositories call it to differentiate it from Lua v5.0.
Also simplified the CMake find script a lot since it doesn't have to find both Lua versions anymore.
Modified: code/branches/kicklib/cmake/LibraryConfig.cmake
===================================================================
--- code/branches/kicklib/cmake/LibraryConfig.cmake 2011-02-21 01:42:49 UTC (rev 7943)
+++ code/branches/kicklib/cmake/LibraryConfig.cmake 2011-02-21 02:47:04 UTC (rev 7944)
@@ -94,7 +94,7 @@
FIND_PACKAGE(OGRE 1.4 REQUIRED)
#FIND_PACKAGE(ENet 1.1 REQUIRED)
-FIND_PACKAGE(Lua 5.1 REQUIRED)
+FIND_PACKAGE(Lua5.1 REQUIRED)
FIND_PACKAGE(Ogg REQUIRED)
FIND_PACKAGE(Vorbis REQUIRED)
FIND_PACKAGE(ALUT REQUIRED)
@@ -154,24 +154,19 @@
# You may want to edit these settings if you provide your own libraries
# Note: Default option in the libraries vary, but our default option is dynamic
IF(WIN32)
- OPTION(LINK_BOOST_DYNAMIC "Link Boost dynamically on Windows" TRUE)
- OPTION(LINK_CEGUI_DYNAMIC "Link CEGUI dynamicylly on Windows" TRUE)
- #OPTION(LINK_ENET_DYNAMIC "Link ENet dynamically on Windows" TRUE)
- OPTION(LINK_OGRE_DYNAMIC "Link OGRE dynamically on Windows" TRUE)
- OPTION(LINK_TCL_DYNAMIC "Link TCL dynamically on Windows" TRUE)
- OPTION(LINK_ZLIB_DYNAMIC "Link ZLib dynamically on Windows" TRUE)
- COMPARE_VERSION_STRINGS("${LUA_VERSION}" "5.1" _version_comparison)
- IF(_version_comparison LESS 0)
- OPTION(LINK_LUA_DYNAMIC "Link Lua dynamically on Windows" FALSE)
- ELSE(_version_comparison LESS 0)
- OPTION(LINK_LUA_DYNAMIC "Link Lua dynamically on Windows" TRUE)
- ENDIF(_version_comparison LESS 0)
+ OPTION(LINK_BOOST_DYNAMIC "Link Boost dynamically on Windows" TRUE)
+ OPTION(LINK_CEGUI_DYNAMIC "Link CEGUI dynamicylly on Windows" TRUE)
+ #OPTION(LINK_ENET_DYNAMIC "Link ENet dynamically on Windows" TRUE)
+ OPTION(LINK_OGRE_DYNAMIC "Link OGRE dynamically on Windows" TRUE)
+ OPTION(LINK_TCL_DYNAMIC "Link TCL dynamically on Windows" TRUE)
+ OPTION(LINK_ZLIB_DYNAMIC "Link ZLib dynamically on Windows" TRUE)
+ OPTION(LINK_LUA5.1_DYNAMIC "Link Lua dynamically on Windows" TRUE)
IF(DEPENDENCY_PACKAGE_ENABLE)
MARK_AS_ADVANCED(
LINK_BOOST_DYNAMIC LINK_CEGUI_DYNAMIC #LINK_ENET_DYNAMIC
LINK_OGRE_DYNAMIC LINK_TCL_DYNAMIC LINK_ZLIB_DYNAMIC
- LINK_LUA_DYNAMIC
+ LINK_LUA5.1_DYNAMIC
)
ENDIF()
ENDIF(WIN32)
Modified: code/branches/kicklib/cmake/LibraryConfigTardis.cmake
===================================================================
--- code/branches/kicklib/cmake/LibraryConfigTardis.cmake 2011-02-21 01:42:49 UTC (rev 7943)
+++ code/branches/kicklib/cmake/LibraryConfigTardis.cmake 2011-02-21 02:47:04 UTC (rev 7944)
@@ -76,7 +76,7 @@
#SET(ENV{ALUTDIR} "/usr/pack/openal-0.0.8-cl;/usr/pack/openal-0.0.8-cl/i686-debian-linux3.1")
#SET(ENV{OGGDIR} "/usr/pack/oggvorbis-1.0-ds;/usr/pack/oggvorbis-1.0-ds/i686-debian-linux3.0")
#SET(ENV{VORBISDIR} "/usr/pack/oggvorbis-1.0-ds;/usr/pack/oggvorbis-1.0-ds/i686-debian-linux3.0")
- #SET(ENV{LUA_DIR} "/usr/pack/lua-5.1.4-sd;/usr/pack/lua-5.1.4-sd/i686-debian-linux4.0")
+ #SET(ENV{LUA5.1_DIR} "/usr/pack/lua-5.1.4-sd;/usr/pack/lua-5.1.4-sd/i686-debian-linux4.0")
#SET(ENV{OGRE_HOME} "/usr/pack/ogre-1.4.9-sd;/usr/pack/ogre-1.4.9-sd/i686-debian-linux4.0")
#SET(ENV{OPENALDIR} "/usr/pack/openal-0.0.8-cl;/usr/pack/openal-0.0.8-cl/i686-debian-linux3.1")
#SET(TCL_INCLUDE_PATH "/usr/pack/tcltk-8.4.9.linux-mo/include")
Modified: code/branches/kicklib/cmake/PackageConfig.cmake
===================================================================
--- code/branches/kicklib/cmake/PackageConfig.cmake 2011-02-21 01:42:49 UTC (rev 7943)
+++ code/branches/kicklib/cmake/PackageConfig.cmake 2011-02-21 02:47:04 UTC (rev 7944)
@@ -83,7 +83,7 @@
SET(ENV{DBGHELP_DIR} ${DEP_INCLUDE_DIR}/dbghelp)
SET(ENV{DXSDK_DIR} ${DEP_INCLUDE_DIR}/directx)
#SET(ENV{ENETDIR} ${DEP_INCLUDE_DIR}/enet)
-SET(ENV{LUA_DIR} ${DEP_INCLUDE_DIR}/lua)
+SET(ENV{LUA5.1_DIR} ${DEP_INCLUDE_DIR}/lua)
SET(ENV{OGGDIR} ${DEP_INCLUDE_DIR}/libogg)
SET(ENV{VORBISDIR} ${DEP_INCLUDE_DIR}/libvorbis)
SET(ENV{OGRE_HOME} ${DEP_INCLUDE_DIR}/ogre)
Deleted: code/branches/kicklib/cmake/tools/FindLua.cmake
===================================================================
--- code/branches/kicklib/cmake/tools/FindLua.cmake 2011-02-21 01:42:49 UTC (rev 7943)
+++ code/branches/kicklib/cmake/tools/FindLua.cmake 2011-02-21 02:47:04 UTC (rev 7944)
@@ -1,184 +0,0 @@
- #
- # ORXONOX - the hottest 3D action shooter ever to exist
- # > www.orxonox.net <
- #
- # This program is free software; you can redistribute it and/or
- # modify it under the terms of the GNU General Public License
- # as published by the Free Software Foundation; either version 2
- # of the License, or (at your option) any later version.
- #
- # This program is distributed in the hope that it will be useful,
- # but WITHOUT ANY WARRANTY; without even the implied warranty of
- # MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- # GNU General Public License for more details.
- #
- # You should have received a copy of the GNU General Public License along
- # with this program; if not, write to the Free Software Foundation,
- # Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
- #
- #
- # Author:
- # Reto Grieder
- # Description:
- # Finds either Lua 5.0 or Lua 5.1 on the system. The script regards the
- # VERSION, EXACT, REQUIRED and QUIET arguments. A note about the EXACT
- # argument: EXACT 5 will match all Lua 5 versions.
- # When the search was successful, the following variables are set:
- # LUA_INCLUDE_DIR, LUA_LIBRARIES, LUA_VERSION, LUA_FOUND
- #
-
-INCLUDE(CompareVersionStrings)
-INCLUDE(FindPackageHandleAdvancedArgs)
-INCLUDE(HandleLibraryTypes)
-
-# Macro that determines Lua version. Should work for versions 2.2 and above (current release: 5.1.4)
-FUNCTION(DETERMINE_LUA_VERSION _file _varname)
- IF(EXISTS ${_file})
- FILE(STRINGS ${_file} _file_content REGEX "LUA_VERSION|LUA_RELEASE")
- ELSE()
- SET(${_varname} "0" PARENT_SCOPE)
- RETURN()
- ENDIF()
- STRING(REGEX REPLACE "^.*LUA_RELEASE[ \t]+\"Lua[ \t]+([.0-9]+)\".*$" "\\1" ${_varname} "${_file_content}")
- IF(${_varname} STREQUAL "${_file_content}")
- # At most version 5.1.0
- STRING(REGEX REPLACE "^.*LUA_VERSION[ \t]+\"Lua[ \t]+([.0-9]+)\".*$" "\\1" ${_varname} "${_file_content}")
- IF(${_varname} STREQUAL "${_file_content}")
- MESSAGE(FATAL_ERROR "Could not determine Lua version which means this script has a bug")
- ENDIF()
- IF(${_varname} MATCHES "^[0-9]+\\.[0-9]+$")
- SET(${_varname} "${${_varname}}.0") # E.g. "3.2" is "3.2.0" actually
- ENDIF()
- ENDIF()
- SET(${_varname} "${${_varname}}" PARENT_SCOPE)
-ENDFUNCTION(DETERMINE_LUA_VERSION)
-
-
-# Find Lua 5.1
-FIND_PATH(LUA_5.1_INCLUDE_DIR lua.h
- PATHS $ENV{LUA_DIR}
- PATH_SUFFIXES include/lua51 include/lua5.1 include/lua include
-)
-IF(LUA_5.1_INCLUDE_DIR)
- DETERMINE_LUA_VERSION(${LUA_5.1_INCLUDE_DIR}/lua.h LUA_5.1_VERSION)
- COMPARE_VERSION_STRINGS("${LUA_5.1_VERSION}" "5.1" _version_compare TRUE)
- IF(NOT _version_compare EQUAL 0)
- # Incorrect version found, abort search
- SET(LUA_5.1_INCLUDE_DIR "LUA_5.1_INCLUDE_DIR-NOTFOUND" CACHE PATH "" FORCE)
- ELSE()
- FIND_LIBRARY(LUA_5.1_LIBRARY_OPTIMIZED
- NAMES lua51 lua5.1 lua
- PATHS $ENV{LUA_DIR}
- PATH_SUFFIXES lib64 lib
- )
- FIND_LIBRARY(LUA_5.1_LIBRARY_DEBUG
- NAMES lua51d lua51_d lua5.1d lua5.1_d luad lua_d
- lua51D lua51_D lua5.1D lua5.1_D luad lua_D
- PATHS $ENV{LUA_DIR}
- PATH_SUFFIXES lib64 lib
- )
- HANDLE_LIBRARY_TYPES(LUA_5.1)
- SET(LUA_5.1_LIBRARIES ${LUA_5.1_LIBRARY})
- IF(LUA_5.1_LIBRARIES)
- SET(LUA_5.1_FOUND TRUE)
- ENDIF()
- ENDIF(NOT _version_compare EQUAL 0)
-ENDIF(LUA_5.1_INCLUDE_DIR)
-
-
-# Find Lua 5.0
-FIND_PATH(LUA_5.0_INCLUDE_DIR lua.h
- PATHS $ENV{LUA_DIR}
- PATH_SUFFIXES include/lua50 include/lua5.0 include/lua5 include/lua include
-)
-IF(LUA_5.0_INCLUDE_DIR)
- DETERMINE_LUA_VERSION(${LUA_5.0_INCLUDE_DIR}/lua.h LUA_5.0_VERSION)
- COMPARE_VERSION_STRINGS("${LUA_5.0_VERSION}" "5.0" _version_compare TRUE)
- IF(NOT _version_compare EQUAL 0)
- # Incorrect version found, abourt search
- SET(LUA_5.0_INCLUDE_DIR "LUA_5.0_INCLUDE_DIR-NOTFOUND" CACHE PATH "" FORCE)
- ELSE()
- FIND_LIBRARY(LUA_5.0_LUA_LIBRARY_OPTIMIZED
- NAMES lua50 lua5.0 lua5 lua
- PATHS $ENV{LUA_DIR}
- PATH_SUFFIXES lib64 lib
- )
- FIND_LIBRARY(LUA_5.0_LUA_LIBRARY_DEBUG
- NAMES lua50d lua50_d lua5.0d lua5.0_d lua5d lua5_d luad lua_d
- lua50D lua50_D lua5.0D lua5.0_D lua5d lua5_D luaD lua_D
- PATHS $ENV{LUA_DIR}
- PATH_SUFFIXES lib64 lib
- )
- HANDLE_LIBRARY_TYPES(LUA_5.0_LUA)
-
- # In an OS X framework, lualib is usually included as part of the framework
- # (like GLU in OpenGL.framework)
- IF(${LUA_5.0_LUA_LIBRARY} MATCHES "framework")
- SET(LUA_5.0_LIBRARIES ${LUA_5.0_LUA_LIBRARY})
- ELSE()
- FIND_LIBRARY(LUA_5.0_LUALIB_LIBRARY_OPTIMIZED
- NAMES lualib50 lualib5.0 lualib5 lualib
- PATHS $ENV{LUALIB_DIR} $ENV{LUA_DIR}
- PATH_SUFFIXES lib64 lib
- )
- FIND_LIBRARY(LUA_5.0_LUALIB_LIBRARY_DEBUG
- NAMES lualib50d lualib50_d lualib5.0d lualib5.0_d
- lualib5d lualib5_d lualibd lualib_d
- lualib50D lualib50_D lualib5.0D lualib5.0_D
- lualib5D lualib5_D lualibD lualib_D
- PATHS $ENV{LUALIB_DIR} $ENV{LUA_DIR}
- PATH_SUFFIXES lib64 lib
- )
- HANDLE_LIBRARY_TYPES(LUA_5.0_LUALIB)
- # Both libraries are required for Lua 5.0 to be found
- IF(LUA_5.0_LUA_LIBRARY AND LUA_5.0_LUALIB_LIBRARY)
- SET(LUA_5.0_LIBRARIES ${LUA_5.0_LUA_LIBRARY} ${LUA_5.0_LUALIB_LIBRARY})
- ENDIF()
- ENDIF(${LUA_5.0_LUA_LIBRARY} MATCHES "framework")
-
- IF(LUA_5.0_LIBRARIES)
- SET(LUA_5.0_FOUND TRUE)
- ENDIF()
- ENDIF(NOT _version_compare EQUAL 0)
-ENDIF(LUA_5.0_INCLUDE_DIR)
-
-# Pick the right version
-IF(Lua_FIND_VERSION_EXACT AND NOT Lua_FIND_VERSION MATCHES "^[0-9]*$")
- STRING(REGEX REPLACE "^([0-9]+\\.[0-9]+)(\\..*)?$" "\\1" LUA_VERSION_SELECTION ${Lua_FIND_VERSION})
-ELSE()
- IF(LUA_5.1_FOUND) # Prefer version 5.1 if found
- SET(LUA_VERSION_SELECTION "5.1")
- ELSEIF(LUA_5.0_FOUND)
- SET(LUA_VERSION_SELECTION "5.0")
- ENDIF()
-ENDIF()
-
-SET(LUA_INCLUDE_DIR "${LUA_${LUA_VERSION_SELECTION}_INCLUDE_DIR}")
-SET(LUA_LIBRARIES "${LUA_${LUA_VERSION_SELECTION}_LIBRARIES}")
-SET(LUA_VERSION_LONG "${LUA_${LUA_VERSION_SELECTION}_VERSION}")
-SET(LUA_VERSION "${LUA_VERSION_SELECTION}")
-
-FIND_PACKAGE_HANDLE_ADVANCED_ARGS(Lua DEFAULT_MSG "${LUA_VERSION_LONG}"
- LUA_LIBRARIES
- LUA_INCLUDE_DIR
-)
-
-# Include the math library for Unix only
-IF(LUA_FOUND)
- IF(UNIX AND NOT APPLE)
- FIND_LIBRARY(UNIX_MATH_LIBRARY m)
- SET(LUA_LIBRARIES ${LUA_LIBRARIES} ${UNIX_MATH_LIBRARY})
- ENDIF()
-ENDIF(LUA_FOUND)
-
-MARK_AS_ADVANCED(
- LUA_5.0_INCLUDE_DIR
- LUA_5.0_LUA_LIBRARY_OPTIMIZED
- LUA_5.0_LUA_LIBRARY_DEBUG
- LUA_5.0_LUALIB_LIBRARY_OPTIMIZED
- LUA_5.0_LUALIB_LIBRARY_DEBUG
- LUA_5.1_INCLUDE_DIR
- LUA_5.1_LIBRARY_OPTIMIZED
- LUA_5.1_LIBRARY_DEBUG
- UNIX_MATH_LIBRARY
-)
Copied: code/branches/kicklib/cmake/tools/FindLua5.1.cmake (from rev 7943, code/branches/kicklib/cmake/tools/FindLua.cmake)
===================================================================
--- code/branches/kicklib/cmake/tools/FindLua5.1.cmake (rev 0)
+++ code/branches/kicklib/cmake/tools/FindLua5.1.cmake 2011-02-21 02:47:04 UTC (rev 7944)
@@ -0,0 +1,99 @@
+ #
+ # ORXONOX - the hottest 3D action shooter ever to exist
+ # > www.orxonox.net <
+ #
+ # This program is free software; you can redistribute it and/or
+ # modify it under the terms of the GNU General Public License
+ # as published by the Free Software Foundation; either version 2
+ # of the License, or (at your option) any later version.
+ #
+ # This program is distributed in the hope that it will be useful,
+ # but WITHOUT ANY WARRANTY; without even the implied warranty of
+ # MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ # GNU General Public License for more details.
+ #
+ # You should have received a copy of the GNU General Public License along
+ # with this program; if not, write to the Free Software Foundation,
+ # Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
+ #
+ #
+ # Author:
+ # Reto Grieder
+ # Description:
+ # Finds Lua 5.1 on the system.
+ # Handles REQUIRED and QUIET arguments.
+ # When the search was successful, the following variables are set:
+ # LUA5.1_INCLUDE_DIR, LUA5.1_LIBRARY, LUA5.1_VERSION, LUA5.1_FOUND
+ #
+
+INCLUDE(CompareVersionStrings)
+INCLUDE(FindPackageHandleAdvancedArgs)
+INCLUDE(HandleLibraryTypes)
+
+# Macro that determines Lua version. Should work for versions 2.2 and above (current release: 5.1.4)
+FUNCTION(DETERMINE_LUA_VERSION _file _varname)
+ IF(EXISTS ${_file})
+ FILE(STRINGS ${_file} _file_content REGEX "LUA_VERSION|LUA_RELEASE")
+ ELSE()
+ SET(${_varname} "0" PARENT_SCOPE)
+ RETURN()
+ ENDIF()
+ STRING(REGEX REPLACE "^.*LUA_RELEASE[ \t]+\"Lua[ \t]+([.0-9]+)\".*$" "\\1" ${_varname} "${_file_content}")
+ IF(${_varname} STREQUAL "${_file_content}")
+ # At most version 5.1.0
+ STRING(REGEX REPLACE "^.*LUA_VERSION[ \t]+\"Lua[ \t]+([.0-9]+)\".*$" "\\1" ${_varname} "${_file_content}")
+ IF(${_varname} STREQUAL "${_file_content}")
+ MESSAGE(FATAL_ERROR "Could not determine Lua version which means this script has a bug")
+ ENDIF()
+ IF(${_varname} MATCHES "^[0-9]+\\.[0-9]+$")
+ SET(${_varname} "${${_varname}}.0") # E.g. "3.2" is "3.2.0" actually
+ ENDIF()
+ ENDIF()
+ SET(${_varname} "${${_varname}}" PARENT_SCOPE)
+ENDFUNCTION(DETERMINE_LUA_VERSION)
+
+
+# Find include path
+FIND_PATH(LUA5.1_INCLUDE_DIR lua.h
+ PATHS $ENV{LUA_DIR}
+ PATH_SUFFIXES include/lua51 include/lua5.1 include/lua include
+)
+
+# Check whether we really found Lua version 5.1
+IF(LUA5.1_INCLUDE_DIR)
+ DETERMINE_LUA_VERSION(${LUA5.1_INCLUDE_DIR}/lua.h LUA5.1_VERSION)
+ COMPARE_VERSION_STRINGS("${LUA5.1_VERSION}" "5.1" _version_compare TRUE)
+ IF(NOT _version_compare EQUAL 0)
+ # Wrong version
+ SET(LUA5.1_INCLUDE_DIR "LUA5.1_INCLUDE_DIR-NOTFOUND" CACHE PATH "" FORCE)
+ ENDIF(NOT _version_compare EQUAL 0)
+ENDIF(LUA5.1_INCLUDE_DIR)
+
+# Find library
+FIND_LIBRARY(LUA5.1_LIBRARY_OPTIMIZED
+ NAMES lua51 lua5.1 lua
+ PATHS $ENV{LUA5.1_DIR} $ENV{LUA_DIR}
+ PATH_SUFFIXES lib64 lib
+)
+FIND_LIBRARY(LUA5.1_LIBRARY_DEBUG
+ NAMES lua51d lua51_d lua5.1d lua5.1_d
+ lua51D lua51_D lua5.1D lua5.1_D
+ luad lua_d luad lua_D
+ PATHS $ENV{LUA5.1_DIR} $ENV{LUA_DIR}
+ PATH_SUFFIXES lib64 lib
+)
+
+# Handle the REQUIRED argument and set LUA5.1_FOUND
+FIND_PACKAGE_HANDLE_ADVANCED_ARGS(Lua5.1 DEFAULT_MSG
+ LUA5.1_LIBRARY
+ LUA5.1_INCLUDE_DIR
+)
+
+# Collect optimized and debug libraries
+HANDLE_LIBRARY_TYPES(LUA5.1)
+
+MARK_AS_ADVANCED(
+ LUA5.1_INCLUDE_DIR
+ LUA5.1_LIBRARY_OPTIMIZED
+ LUA5.1_LIBRARY_DEBUG
+)
Modified: code/branches/kicklib/src/CMakeLists.txt
===================================================================
--- code/branches/kicklib/src/CMakeLists.txt 2011-02-21 01:42:49 UTC (rev 7943)
+++ code/branches/kicklib/src/CMakeLists.txt 2011-02-21 02:47:04 UTC (rev 7944)
@@ -38,7 +38,7 @@
# If no defines are specified, these libs get linked statically
ADD_COMPILER_FLAGS("-DBOOST_ALL_DYN_LINK" WIN32 LINK_BOOST_DYNAMIC)
#ADD_COMPILER_FLAGS("-DENET_DLL" WIN32 LINK_ENET_DYNAMIC)
-ADD_COMPILER_FLAGS("-DLUA_BUILD_AS_DLL" WIN32 LINK_LUA_DYNAMIC)
+ADD_COMPILER_FLAGS("-DLUA_BUILD_AS_DLL" WIN32 LINK_LUA5.1_DYNAMIC)
ADD_COMPILER_FLAGS("-DZLIB_DLL" WIN32 LINK_ZLIB_DYNAMIC)
# If no defines are specified, these libs get linked dynamically
ADD_COMPILER_FLAGS("-DCEGUI_STATIC -DTOLUA_STATIC" WIN32 NOT LINK_CEGUI_DYNAMIC)
@@ -77,7 +77,7 @@
${ALUT_INCLUDE_DIR}
${VORBIS_INCLUDE_DIR}
${OGG_INCLUDE_DIR}
- ${LUA_INCLUDE_DIR}
+ ${LUA5.1_INCLUDE_DIR}
${TCL_INCLUDE_PATH}
${DIRECTX_INCLUDE_DIR}
${ZLIB_INCLUDE_DIR}
Modified: code/branches/kicklib/src/external/tolua/CMakeLists.txt
===================================================================
--- code/branches/kicklib/src/external/tolua/CMakeLists.txt 2011-02-21 01:42:49 UTC (rev 7943)
+++ code/branches/kicklib/src/external/tolua/CMakeLists.txt 2011-02-21 02:47:04 UTC (rev 7944)
@@ -25,16 +25,16 @@
1.0.92
NO_INSTALL
LINK_LIBRARIES
- ${LUA_LIBRARIES}
+ ${LUA5.1_LIBRARY}
SOURCE_FILES
tolua.c
)
# Set some variables to the cache in order to use them in the TOLUA macro
-SET(TOLUA_PARSER_SOURCE "${CMAKE_CURRENT_SOURCE_DIR}/all-${LUA_VERSION}.lua" CACHE INTERNAL "")
+SET(TOLUA_PARSER_SOURCE "${CMAKE_CURRENT_SOURCE_DIR}/all-5.1.lua" CACHE INTERNAL "")
SET(TOLUA_PARSER_DEPENDENCIES
toluaapp_orxonox
- ${CMAKE_CURRENT_SOURCE_DIR}/all-${LUA_VERSION}.lua
+ ${CMAKE_CURRENT_SOURCE_DIR}/all-5.1.lua
${CMAKE_CURRENT_SOURCE_DIR}/lua/compat-5.1.lua
${CMAKE_CURRENT_SOURCE_DIR}/lua/compat.lua
${CMAKE_CURRENT_SOURCE_DIR}/lua/basic.lua
Deleted: code/branches/kicklib/src/external/tolua/all-5.0.lua
===================================================================
--- code/branches/kicklib/src/external/tolua/all-5.0.lua 2011-02-21 01:42:49 UTC (rev 7943)
+++ code/branches/kicklib/src/external/tolua/all-5.0.lua 2011-02-21 02:47:04 UTC (rev 7944)
@@ -1,28 +0,0 @@
-dofile(path.."lua/compat.lua")
-dofile(path.."lua/basic.lua")
-dofile(path.."lua/feature.lua")
-dofile(path.."lua/verbatim.lua")
-dofile(path.."lua/code.lua")
-dofile(path.."lua/typedef.lua")
-dofile(path.."lua/container.lua")
-dofile(path.."lua/package.lua")
-dofile(path.."lua/module.lua")
-dofile(path.."lua/namespace.lua")
-dofile(path.."lua/define.lua")
-dofile(path.."lua/enumerate.lua")
-dofile(path.."lua/declaration.lua")
-dofile(path.."lua/variable.lua")
-dofile(path.."lua/array.lua")
-dofile(path.."lua/function.lua")
-dofile(path.."lua/operator.lua")
-dofile(path.."lua/class.lua")
-dofile(path.."lua/clean.lua")
---dofile(path.."lua/custom.lua")
-dofile(path.."lua/doit.lua")
-
-local err,msg = xpcall(doit, debug.traceback)
-if not err then
---print("**** msg is "..tostring(msg))
- local _,_,label,msg = strfind(msg,"(.-:.-:%s*)(.*)")
- tolua_error(msg,label)
-end
Modified: code/branches/kicklib/src/libraries/core/CMakeLists.txt
===================================================================
--- code/branches/kicklib/src/libraries/core/CMakeLists.txt 2011-02-21 01:42:49 UTC (rev 7943)
+++ code/branches/kicklib/src/libraries/core/CMakeLists.txt 2011-02-21 02:47:04 UTC (rev 7944)
@@ -93,7 +93,7 @@
${CEGUI_LIBRARY}
${CEGUILUA_LIBRARY}
${CEGUI_TOLUA_LIBRARY}
- ${LUA_LIBRARIES}
+ ${LUA5.1_LIBRARY}
cpptcl_orxonox
ogreceguirenderer_orxonox
ois_orxonox
More information about the Orxonox-commit
mailing list