Changeset 1115

Timestamp:

Apr 20, 2008, 2:54:15 AM (16 years ago)

Author:

landauf

Message:

tried to integrate the whole tolua-thing in proper cmake code

Location:

code/trunk

Files:

• CMakeLists.txt (modified) (1 diff)
• bin/tolua-exec-script (deleted)
• src/CMakeLists.txt (modified) (1 diff)
• src/core/CMakeLists.txt (modified) (2 diffs)
• src/core/Script.cc (modified) (1 diff)
• src/core/tolua (deleted)
• src/tolua (moved) (moved from code/trunk/src/util/tolua)
• src/tolua/CMakeLists.txt (modified) (2 diffs)
• src/tolua/tolua.pkg (copied) (copied from code/trunk/src/core/tolua/tolua.pkg) (1 diff)
• src/util/CMakeLists.txt (modified) (3 diffs)
• tolua-build (deleted)
• tolua-exec-script.bat (deleted)
• tolua.cmake (deleted)

code/trunk/CMakeLists.txt

@@ -79 +79 @@
   ${ENet_INCLUDE_DIR}
   ${Boost_INCLUDE_DIRS}
-  ${OPENAL_INCLUDE_DIR} ${ALUT_INCLUDE_DIR} ${VORBIS_INCLUDE_DIR} ${OGG_INCLUDE_DIR}
+  ${OPENAL_INCLUDE_DIR}
+  ${ALUT_INCLUDE_DIR}
+  ${VORBIS_INCLUDE_DIR}
+  ${OGG_INCLUDE_DIR}
   ${Lua_INCLUDE_DIR}
 )
-
-
-################ Source files ###################
-
-#if on a windows box, you have to generate the tolua bind files yourself
-IF(NOT WIN32)
-
-  #At first, build lua
-  MESSAGE(STATUS "\n******************* Building tolua... ******************\n\n")
-  EXECUTE_PROCESS(COMMAND ./tolua-build)
-  MESSAGE(STATUS "\n\n******************* Building tolua done ****************\n")
-
-  #generate lua bind source files
-  EXECUTE_PROCESS(COMMAND bin/./tolua-exec-script)
-
-ENDIF(NOT WIN32)
 
 #add main source dir

code/trunk/src/CMakeLists.txt

@@ -1 +1 @@
 INCLUDE_DIRECTORIES(.)
 INCLUDE_DIRECTORIES(orxonox)
-INCLUDE_DIRECTORIES(util/tolua)
+INCLUDE_DIRECTORIES(tolua)
 
+ADD_SUBDIRECTORY(tolua)
 ADD_SUBDIRECTORY(util)
 ADD_SUBDIRECTORY(core)

code/trunk/src/core/CMakeLists.txt

@@ -1 @@
-#get the created files
-AUX_SOURCE_DIRECTORY(tolua TOLUA_BIND_FILES) 
-
-SET( CORE_SRC_FILES
+SET(CORE_SRC_FILES
   OrxonoxClass.cc
   BaseObject.cc
@@ -29 +26 @@
   Tickable.cc
   Script.cc
-  ${TOLUA_BIND_FILES}
 )
 
-ADD_LIBRARY( core SHARED ${CORE_SRC_FILES})
+ADD_LIBRARY(core SHARED ${CORE_SRC_FILES})
 
-TARGET_LINK_LIBRARIES( core
+TARGET_LINK_LIBRARIES(core
   util
+  tolualib
   ${Lua_LIBRARIES}
   ${Lua_LIBRARY}

code/trunk/src/core/Script.cc

@@ -39 +39 @@
 }
 
-#include "tolua++.h"
+#include "tolua/tolua++.h"
 #include "tolua/tolua_bind.h"
 

code/trunk/src/tolua/CMakeLists.txt

@@ -1 @@
-PROJECT(ToLua)
-
-#This sets where to look for modules (e.g. "Find*.cmake" files)
-SET(CMAKE_MODULE_PATH ${CMAKE_CURRENT_SOURCE_DIR}/../../../cmake/)
-
-#Check whether we are on a tardis box
-INCLUDE(CheckTardis)
-
-########## Compiler/Linker options ##############
-
-# if on tardis change compiler and reset boost include directory
-IF(IS_TARDIS)
-  MESSAGE("System is a TARDIS: Setting Compiler to g++-4.1.1")
-  # force-set the compiler on tardis machines, as default points to g++-3.3
-  SET(CMAKE_CXX_COMPILER "g++-4.1.1")
-ENDIF(IS_TARDIS)
-
-#set binary output directories
-SET(EXECUTABLE_OUTPUT_PATH ${PROJECT_BINARY_DIR}/../../../bin)
-SET(LIBRARY_OUTPUT_PATH    ${PROJECT_BINARY_DIR}/../../../bin)
-
-# global compiler/linker flags. force -O2!
-SET(CMAKE_C_FLAGS "$ENV{CFLAGS} -O2 -Wall -g -ggdb")
-SET(CMAKE_CXX_FLAGS "$ENV{CXXFLAGS} -O2 -Wall -g -ggdb")
-SET(CMAKE_LD_FLAGS "$ENV{LDFLAGS}")
-SET(CMAKE_EXE_LINKER_FLAGS " --no-undefined")
-SET(CMAKE_SHARED_LINKER_FLAGS " --no-undefined")
-SET(CMAKE_MODULE_LINKER_FLAGS " --no-undefined")
-
-#Create verbose makefile output when compiling
-SET(CMAKE_VERBOSE_MAKEFILE TRUE)
-
-
-############### Library finding #################
-
-#Performs the search and sets the variables
-FIND_PACKAGE(Lua)
-
-#Set the search paths for the linking
-LINK_DIRECTORIES(
-)
-
-#Set the search paths for include files
-INCLUDE_DIRECTORIES(
-  ${Lua_INCLUDE_DIR}
-)
-
-
-################ Source files ###################
-
-SET (TOLUA_SRC_FILES
+SET(TOLUA_SRC_FILES
   tolua.c
   tolua_event.c
@@ -59 +9 @@
 )
 
-ADD_EXECUTABLE( tolua ${TOLUA_SRC_FILES} )
 
-TARGET_LINK_LIBRARIES( tolua
+ADD_EXECUTABLE(tolua ${TOLUA_SRC_FILES})
+
+TARGET_LINK_LIBRARIES(tolua
   ${Lua_LIBRARIES}
   ${Lua_LIBRARY}
   m
 )
+
+
+
+SET(TOLUALIB_SRC_FILES
+  tolua_event.c
+  tolua_is.c
+  tolua_map.c
+  tolua_push.c
+  tolua_to.c
+  tolua_bind.cc
+  tolua_bind.h
+)
+
+SET_SOURCE_FILES_PROPERTIES(tolua_bind.h
+  PROPERTIES
+  OBJECT_DEPENDS tolua_bind.h
+  OBJECT_DEPENDS tolua_bind.cc
+  GENERATED true
+  HEADER_FILE_ONLY true
+)
+
+GET_TARGET_PROPERTY(TOLUA_EXE tolua LOCATION)
+ADD_CUSTOM_COMMAND(
+  OUTPUT tolua_bind.h tolua_bind.cc
+  COMMAND ${TOLUA_EXE} -n orxonox -o ../../src/tolua/tolua_bind.cc -H ../../src/tolua/tolua_bind.h ../../src/tolua/tolua.pkg
+  DEPENDS tolua
+  WORKING_DIRECTORY ${CMAKE_BINARY_DIR}/bin/lib
+)
+
+ADD_LIBRARY(tolualib ${TOLUALIB_SRC_FILES})
+
+TARGET_LINK_LIBRARIES(tolualib
+  ${Lua_LIBRARIES}
+  ${Lua_LIBRARY}
+)
+

code/trunk/src/tolua/tolua.pkg

@@ -1 @@
-$cfile "../Script_clean.h"
+$cfile "../../src/core/Script_clean.h"

code/trunk/src/util/CMakeLists.txt

@@ -1 +1 @@
 AUX_SOURCE_DIRECTORY(tinyxml TINYXML_SRC_FILES)
 
-SET (UTIL_SRC_FILES
+SET(UTIL_SRC_FILES
   ArgReader.cc
   Math.cc
@@ -10 +10 @@
   MultiTypeString.cc
   MultiTypeMath.cc
-  tolua/tolua_event.c
-  tolua/tolua_is.c
-  tolua/tolua_map.c
-  tolua/tolua_push.c
-  tolua/tolua_to.c
   ${TINYXML_SRC_FILES}
 )
 
-ADD_LIBRARY( util SHARED ${UTIL_SRC_FILES} )
+ADD_LIBRARY(util SHARED ${UTIL_SRC_FILES})
 
 IF(TESTING_ENABLED)
@@ -24 +19 @@
 ENDIF(TESTING_ENABLED)
 
-TARGET_LINK_LIBRARIES( util
+TARGET_LINK_LIBRARIES(util
   ${OGRE_LIBRARIES}
-  ${Lua_LIBRARIES}
-  ${Lua_LIBRARY}
 )