From 488e1692cc16fdf4e15fd1a3e01f7dcd901e7b6f Mon Sep 17 00:00:00 2001 From: Robert Osfield Date: Tue, 4 Feb 2014 11:24:01 +0000 Subject: [PATCH] From Stephan Huber, added support for compile source code of lua with the lua plugin --- src/osgPlugins/CMakeLists.txt | 2 +- src/osgPlugins/lua/CMakeLists.txt | 41 ++++++++++++++++++++++++++++++- 2 files changed, 41 insertions(+), 2 deletions(-) diff --git a/src/osgPlugins/CMakeLists.txt b/src/osgPlugins/CMakeLists.txt index 5aab0108d..0010b24bd 100644 --- a/src/osgPlugins/CMakeLists.txt +++ b/src/osgPlugins/CMakeLists.txt @@ -263,7 +263,7 @@ ADD_SUBDIRECTORY(trk) # # ScriptEngines # -IF (LUA_LIBRARIES AND LUA_INCLUDE_DIR) +IF ((LUA_LIBRARIES AND LUA_INCLUDE_DIR) OR (LUA_SOURCE_DIR AND LUA_INCLUDE_DIR)) ADD_SUBDIRECTORY(lua) ENDIF() diff --git a/src/osgPlugins/lua/CMakeLists.txt b/src/osgPlugins/lua/CMakeLists.txt index da94edf0a..b33d21d54 100644 --- a/src/osgPlugins/lua/CMakeLists.txt +++ b/src/osgPlugins/lua/CMakeLists.txt @@ -6,7 +6,46 @@ SET(TARGET_SRC ReaderWriterLua.cpp ) -SET(TARGET_EXTERNAL_LIBRARIES ${TARGET_EXTERNAL_LIBRARIES} ${LUA_LIBRARY}) +IF(LUA_LIBRARY) + SET(TARGET_EXTERNAL_LIBRARIES ${TARGET_EXTERNAL_LIBRARIES} ${LUA_LIBRARY}) +ENDIF() +# Some platforms do not provide an easy way to compile lua, include the source-files directly +IF(LUA_SOURCE_DIR) + SET(TARGET_SRC + ${TARGET_SRC} + ${LUA_SOURCE_DIR}/lauxlib.c + ${LUA_SOURCE_DIR}/lbaselib.c + ${LUA_SOURCE_DIR}/lbitlib.c + ${LUA_SOURCE_DIR}/lcode.c + ${LUA_SOURCE_DIR}/lcorolib.c + ${LUA_SOURCE_DIR}/lctype.c + ${LUA_SOURCE_DIR}/ldblib.c + ${LUA_SOURCE_DIR}/ldebug.c + ${LUA_SOURCE_DIR}/ldo.c + ${LUA_SOURCE_DIR}/ldump.c + ${LUA_SOURCE_DIR}/lfunc.c + ${LUA_SOURCE_DIR}/lgc.c + ${LUA_SOURCE_DIR}/linit.c + ${LUA_SOURCE_DIR}/liolib.c + ${LUA_SOURCE_DIR}/llex.c + ${LUA_SOURCE_DIR}/lmathlib.c + ${LUA_SOURCE_DIR}/lmem.c + ${LUA_SOURCE_DIR}/loadlib.c + ${LUA_SOURCE_DIR}/lobject.c + ${LUA_SOURCE_DIR}/lopcodes.c + ${LUA_SOURCE_DIR}/loslib.c + ${LUA_SOURCE_DIR}/lparser.c + ${LUA_SOURCE_DIR}/lstate.c + ${LUA_SOURCE_DIR}/lstring.c + ${LUA_SOURCE_DIR}/lstrlib.c + ${LUA_SOURCE_DIR}/ltable.c + ${LUA_SOURCE_DIR}/ltablib.c + ${LUA_SOURCE_DIR}/ltm.c + ${LUA_SOURCE_DIR}/lundump.c + ${LUA_SOURCE_DIR}/lvm.c + ${LUA_SOURCE_DIR}/lzio.c + ) +ENDIF() INCLUDE_DIRECTORIES(${LUA_INCLUDE_DIR} ) #### end var setup ###