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

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).

File:

• code/branches/buildsystem/src/tolua/lua/package.lua (modified) (3 diffs)

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

@@ -128 +128 @@
     if flags.H then
         local header = gsub(flags.H, '^.-([%w_]*%.[%w_]*)$', '%1')
-        output('#include "'..header..'"\n')
+        local package_lower = string.lower(self.name)
+        output('#include "'..package_lower..'/'..header..'"\n')
     end
 
@@ -203 +204 @@
 
     if flags.H then
-        output('#include "'..self.name..'Prereqs.h"\n')
+        local package_lower = string.lower(self.name)
+        output('#include "'..package_lower..'/'..self.name..'Prereqs.h"\n')
         output('/* Exported function */')
         output('_'..self.name..'Export')
@@ -220 +222 @@
 -- *** Thanks to Ariel Manzur for fixing bugs in nested directives ***
 function extract_code(fn,s)
-    local code = '\n$#include "'..fn..'"\n'
+    local code = '\n$#include "'..string.lower(flags.n)..'/'..fn..'"\n'
     s= "\n" .. s .. "\n" -- add blank lines as sentinels