Changeset 2239 for code/branches/buildsystem/src/orxonox

Timestamp:

Nov 20, 2008, 10:13:11 PM (16 years ago)

Author:

rgrieder

Message:

Resolved tolua include directory problem in another fashion by adding CMAKE_BINARY_DIR/src to the include directories and adjusting the the include directives. There were some changes necessary in package.lua (it uses the package name as folder to write "#include "core/CommandExecutor.h"").

The problem with the old resolution (-iquotes) was that you could write "#include "Core.h"" in a file that is not in the core, because src/core was effectively added to the list of include directories (just the ones with quotes of course).

Location:

code/branches/buildsystem/src/orxonox

Files:

• CMakeLists.txt (modified) (1 diff)
• gui/GUIManager.cc (modified) (1 diff)

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

@@ -66 +66 @@
 INCLUDE(UseTolua)
 TOLUA(Orxonox ORXONOX_SRC_FILES INPUTFILES gui/GUIManager.h)
-INCLUDE_DIRECTORIES_QUOTES(${CMAKE_CURRENT_SOURCE_DIR} ${CMAKE_CURRENT_BINARY_DIR})
-INCLUDE_DIRECTORIES_QUOTES("${CMAKE_SOURCE_DIR}/src/core" "${CMAKE_BINARY_DIR}/src/core")
 
 ADD_EXECUTABLE( orxonox ${ORXONOX_SRC_FILES} )

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

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