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

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/core

Files:

• CMakeLists.txt (modified) (1 diff)
• Script.cc (modified) (1 diff)

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

@@ -54 +54 @@
 INCLUDE(UseTolua)
 TOLUA(Core CORE_SRC_FILES INPUTFILES Script.h CommandExecutor.h)
-INCLUDE_DIRECTORIES_QUOTES(${CMAKE_CURRENT_SOURCE_DIR} ${CMAKE_CURRENT_BINARY_DIR})
 
 ADD_LIBRARY(core SHARED ${CORE_SRC_FILES})

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

@@ -40 +40 @@
 
 #include "tolua++.h"
-#include "tolua_bind.h"
+#include "core/ToluaBindCore.h"
 
 namespace orxonox