Changeset 1882

Timestamp:

Oct 5, 2008, 12:04:16 AM (16 years ago)

Author:

adrfried

Message:

out-of-source-builds working in basics

Location:

code/branches/buildsystem

Files:

• CMakeLists.txt (modified) (1 diff)
• cmake/UseTolua.cmake (added)
• src/CMakeLists.txt (modified) (1 diff)
• src/core/CMakeLists.txt (modified) (1 diff)
• src/core/Script.cc (modified) (1 diff)
• src/core/tolua/tolua.pkg (deleted)
• src/orxonox/CMakeLists.txt (modified) (2 diffs)
• src/orxonox/gui/GUIManager.cc (modified) (1 diff)
• src/orxonox/tolua/tolua.pkg (deleted)
• src/tolua/CMakeLists.txt (modified) (2 diffs)
• src/tolua/lua/package.lua (modified) (1 diff)
• src/tolua/tolua-5.1.pkg (modified) (1 diff)

code/branches/buildsystem/CMakeLists.txt

@@ -44 +44 @@
 
 # Set binary output directories
-SET(EXECUTABLE_OUTPUT_PATH ${PROJECT_SOURCE_DIR}/bin)
-SET(LIBRARY_OUTPUT_PATH    ${PROJECT_SOURCE_DIR}/bin/lib)
+SET(EXECUTABLE_OUTPUT_PATH ${PROJECT_BINARY_DIR}/bin)
+SET(LIBRARY_OUTPUT_PATH    ${PROJECT_BINARY_DIR}/bin/lib)
 
 # Global compiler/linker flags. force -O2!

code/branches/buildsystem/src/CMakeLists.txt

@@ -2 +2 @@
 INCLUDE_DIRECTORIES(..)
 INCLUDE_DIRECTORIES(orxonox)
+INCLUDE_DIRECTORIES(lua)
 
 ADD_SUBDIRECTORY(cpptcl)

code/branches/buildsystem/src/core/CMakeLists.txt

@@ -50 +50 @@
   input/KeyDetector.cc
   input/SimpleInputState.cc
-
-  tolua/tolua_bind.cc
 )
 
-GET_TARGET_PROPERTY(TOLUA_EXE tolua_orxonox LOCATION)
-ADD_CUSTOM_COMMAND(
-  OUTPUT ${CMAKE_CURRENT_SOURCE_DIR}/tolua/tolua_bind.cc ${CMAKE_CURRENT_SOURCE_DIR}/tolua/tolua_bind.h
-  COMMAND ${TOLUA_EXE} -n Core -o ../../src/core/tolua/tolua_bind.cc -H ../../src/core/tolua/tolua_bind.h ../../src/core/tolua/tolua.pkg
-  DEPENDS
-    tolua_orxonox
-    tolua/tolua.pkg
-    Script.h
-    CommandExecutor.h
-  WORKING_DIRECTORY ${CMAKE_SOURCE_DIR}/bin/lib
-)
+INCLUDE(UseTolua)
+TOLUA(Core CORE_SRC_FILES INPUTFILES Script.h CommandExecutor.h)
 
 ADD_LIBRARY(core SHARED ${CORE_SRC_FILES})

code/branches/buildsystem/src/core/Script.cc

@@ -36 +36 @@
 #include "lua/lua.hpp"
 
-#include "tolua/tolua++.h"
-#include "tolua/tolua_bind.h"
+#include "tolua++.h"
+#include "tolua_bind.h"
 
 namespace orxonox

code/branches/buildsystem/src/orxonox/CMakeLists.txt

@@ -62 +62 @@
   objects/RotatingProjectile.cc
   objects/ParticleProjectile.cc
-
-  tolua/tolua_bind.cc
 )
 
-GET_TARGET_PROPERTY(TOLUA_EXE tolua_orxonox LOCATION)
-ADD_CUSTOM_COMMAND(
-  OUTPUT ${CMAKE_CURRENT_SOURCE_DIR}/tolua/tolua_bind.cc ${CMAKE_CURRENT_SOURCE_DIR}/tolua/tolua_bind.h
-  COMMAND ${TOLUA_EXE} -n Orxonox -o ../../src/orxonox/tolua/tolua_bind.cc -H ../../src/orxonox/tolua/tolua_bind.h ../../src/orxonox/tolua/tolua.pkg
-  DEPENDS
-    tolua_orxonox
-    tolua/tolua.pkg
-    gui/GUIManager.h
-  WORKING_DIRECTORY ${CMAKE_SOURCE_DIR}/bin/lib
-)
-        
+INCLUDE(UseTolua)
+TOLUA(Orxonox ORXONOX_SRC_FILES INPUTFILES gui/GUIManager.h)
+
+SET(CORE_SUBDIR src/core)
+SET(CORE_SOURCE_DIR "${CMAKE_SOURCE_DIR}/${CORE_SUBDIR}")
+SET(CORE_BINARY_DIR "${CMAKE_BINARY_DIR}/${CORE_SUBDIR}")
+SET(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -iquote ${CORE_SOURCE_DIR} -iquote ${CORE_BINARY_DIR}")
+SET(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -iquote ${CORE_SOURCE_DIR} -iquote ${CORE_BINARY_DIR}")
+
 ADD_EXECUTABLE( orxonox ${ORXONOX_SRC_FILES} )
 
@@ -110 +106 @@
   network
 )
-

code/branches/buildsystem/src/orxonox/gui/GUIManager.cc

@@ -43 +43 @@
 #include "core/input/InputManager.h"
 #include "core/input/SimpleInputState.h"
-#include "core/tolua/tolua_bind.h"
+#include "../core/tolua_bind.h"
 #include "core/ConsoleCommand.h"
 #include "core/Core.h"
-#include "tolua/tolua_bind.h"
+#include "tolua_bind.h"
 #include "GraphicsEngine.h"
 #include "OgreCEGUIRenderer.h"

code/branches/buildsystem/src/tolua/CMakeLists.txt

@@ -28 +28 @@
 
 
-SET (TOLUA_PACKAGE "../../src/tolua/tolua-5.1.pkg")
+SET (TOLUA_PACKAGE "${CMAKE_CURRENT_SOURCE_DIR}/tolua-5.1.pkg")
 GET_TARGET_PROPERTY(TOLUAGEN_EXE toluagen_orxonox LOCATION)
 ADD_CUSTOM_COMMAND(
-  OUTPUT ${CMAKE_CURRENT_SOURCE_DIR}/toluabind_orxonox.c
-  COMMAND ${TOLUAGEN_EXE} -n tolua -o ../../src/tolua/toluabind_orxonox.c -H ../../src/tolua/toluabind_orxonox.h ${TOLUA_PACKAGE}
+  OUTPUT ${CMAKE_CURRENT_BINARY_DIR}/toluabind_orxonox.c
+  COMMAND ${TOLUAGEN_EXE} -n tolua -o ${CMAKE_CURRENT_BINARY_DIR}/toluabind_orxonox.c -H ${CMAKE_CURRENT_BINARY_DIR}/toluabind_orxonox.h ${TOLUA_PACKAGE}
   DEPENDS
     toluagen_orxonox
@@ -57 +57 @@
     lua/clean.lua
     lua/doit.lua
-  WORKING_DIRECTORY ${CMAKE_SOURCE_DIR}/bin/lib
+    WORKING_DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR}
 )
 

code/branches/buildsystem/src/tolua/lua/package.lua

@@ -213 +213 @@
 
  if not flags.h then
-  output('#include "../'..self.name..'Prereqs.h"\n')
+  output('#include "'..self.name..'Prereqs.h"\n')
   output('/* Exported function */')
   output('_'..self.name..'Export int  tolua_'..self.name..'_open (lua_State* tolua_S);')

code/branches/buildsystem/src/tolua/tolua-5.1.pkg

@@ -1 @@
-$lfile "../../src/tolua/lua/compat-5.1.lua"
-$lfile "../../src/tolua/lua/compat.lua"
-$lfile "../../src/tolua/lua/basic.lua"
-$lfile "../../src/tolua/lua/feature.lua"
-$lfile "../../src/tolua/lua/verbatim.lua"
-$lfile "../../src/tolua/lua/code.lua"
-$lfile "../../src/tolua/lua/typedef.lua"
-$lfile "../../src/tolua/lua/container.lua"
-$lfile "../../src/tolua/lua/package.lua"
-$lfile "../../src/tolua/lua/module.lua"
-$lfile "../../src/tolua/lua/namespace.lua"
-$lfile "../../src/tolua/lua/define.lua"
-$lfile "../../src/tolua/lua/enumerate.lua"
-$lfile "../../src/tolua/lua/declaration.lua"
-$lfile "../../src/tolua/lua/variable.lua"
-$lfile "../../src/tolua/lua/array.lua"
-$lfile "../../src/tolua/lua/function.lua"
-$lfile "../../src/tolua/lua/operator.lua"
-$lfile "../../src/tolua/lua/class.lua"
-$lfile "../../src/tolua/lua/clean.lua"
-$lfile "../../src/tolua/lua/doit.lua"
+$lfile "lua/compat-5.1.lua"
+$lfile "lua/compat.lua"
+$lfile "lua/basic.lua"
+$lfile "lua/feature.lua"
+$lfile "lua/verbatim.lua"
+$lfile "lua/code.lua"
+$lfile "lua/typedef.lua"
+$lfile "lua/container.lua"
+$lfile "lua/package.lua"
+$lfile "lua/module.lua"
+$lfile "lua/namespace.lua"
+$lfile "lua/define.lua"
+$lfile "lua/enumerate.lua"
+$lfile "lua/declaration.lua"
+$lfile "lua/variable.lua"
+$lfile "lua/array.lua"
+$lfile "lua/function.lua"
+$lfile "lua/operator.lua"
+$lfile "lua/class.lua"
+$lfile "lua/clean.lua"
+$lfile "lua/doit.lua"
 
 $[