Changeset 5752 for code/trunk

Timestamp:

Sep 20, 2009, 2:58:51 PM (15 years ago)

Author:

rgrieder

Message:

Small changes for the include directories:

• Our own directories get specified in src/libraries, src/orxonox and src/modules. This way you cannot include for example "CameraManager.h" in the core library.
• All tolua bind header files now go to src/toluabind to avoid declaring every folder with such header files in src separately (for each module/library).

Location:

code/trunk

Files:

• cmake/GenerateToluaBindings.cmake (modified) (1 diff)
• src/CMakeLists.txt (modified) (3 diffs)
• src/Orxonox.cc (modified) (1 diff)
• src/external/tolua/lua/package.lua (modified) (3 diffs)
• src/libraries/CMakeLists.txt (modified) (1 diff)
• src/modules/CMakeLists.txt (modified) (1 diff)
• src/orxonox/CMakeLists.txt (modified) (1 diff)

code/trunk/cmake/GenerateToluaBindings.cmake

@@ -39 +39 @@
   SET(_tolua_pkgfile "${CMAKE_CURRENT_BINARY_DIR}/tolua.pkg")
   SET(_tolua_cxxfile "${CMAKE_CURRENT_BINARY_DIR}/${CMAKE_CFG_INTDIR}/ToluaBind${_tolua_package}.cc")
-  SET(_tolua_hfile   "${CMAKE_CURRENT_BINARY_DIR}/${CMAKE_CFG_INTDIR}/ToluaBind${_tolua_package}.h")
+  SET(_tolua_hfile   "${CMAKE_BINARY_DIR}/src/toluabind/${CMAKE_CFG_INTDIR}/ToluaBind${_tolua_package}.h")
 
   SET(${_target_source_files}

code/trunk/src/CMakeLists.txt

@@ -69 +69 @@
   ${VLD_INCLUDE_DIR}
 
-  # All library includes are prefixed with the path to avoid conflicts
-  ${CMAKE_CURRENT_SOURCE_DIR}
-  # Bullet headers really need the include directory
+  # All includes in "externals" should be prefixed with the path
+  # relative to "external" to avoid conflicts
+  ${CMAKE_CURRENT_SOURCE_DIR}/external
+  # Include directories needed even if only included by Orxonox
   ${CMAKE_CURRENT_SOURCE_DIR}/external/bullet
-  # OIS headers need the root dir as well
-  ${CMAKE_CURRENT_SOURCE_DIR}/external/ois
+
   # OrxonoxConfig.h
   ${CMAKE_CURRENT_BINARY_DIR}
-  # Tolua bind files for Core
-  ${CMAKE_CURRENT_BINARY_DIR}/libraries/core/${CMAKE_CFG_INTDIR}
-  # Tolua bind files for Orxonox
-  ${CMAKE_CURRENT_BINARY_DIR}/orxonox/${CMAKE_CFG_INTDIR}
-
-  # Add the base directories for convenience
-  ${CMAKE_CURRENT_SOURCE_DIR}/external
-  ${CMAKE_CURRENT_SOURCE_DIR}/libraries
-  ${CMAKE_CURRENT_SOURCE_DIR}/modules
-  ${CMAKE_CURRENT_SOURCE_DIR}/orxonox
 )
 
@@ -93 +83 @@
 ENDIF()
 
+################### Tolua Bind ##################
+
+# Create directory because the tolua application doesn't work otherwise
+IF(NOT EXISTS ${CMAKE_CURRENT_BINARY_DIR}/toluabind/${CMAKE_CFG_INTDIR})
+  FILE(MAKE_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}/toluabind/${CMAKE_CFG_INTDIR})
+ENDIF()
+
+INCLUDE_DIRECTORIES(${CMAKE_CURRENT_BINARY_DIR}/toluabind/${CMAKE_CFG_INTDIR})
+
 ################ Sub Directories ################
 
 ADD_SUBDIRECTORY(external)
 ADD_SUBDIRECTORY(libraries)
+ADD_SUBDIRECTORY(orxonox)
 ADD_SUBDIRECTORY(modules)
-ADD_SUBDIRECTORY(orxonox)
 
 ################ Executable ################
+
+INCLUDE_DIRECTORIES(
+  ${CMAKE_CURRENT_SOURCE_DIR}/libraries
+  ${CMAKE_CURRENT_SOURCE_DIR}/orxonox
+)
 
 # Translate argument
@@ -117 +121 @@
 )
 
+# Get name to configure the run scripts
 GET_TARGET_PROPERTY(_exec_loc orxonox-main LOCATION)
 GET_FILENAME_COMPONENT(_exec_name ${_exec_loc} NAME)

code/trunk/src/Orxonox.cc

@@ -34 +34 @@
 */
 
-#include "OrxonoxPrereqs.h"
 #include "SpecialConfig.h"
 

code/trunk/src/external/tolua/lua/package.lua

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

code/trunk/src/libraries/CMakeLists.txt

@@ -18 +18 @@
  #
 
+INCLUDE_DIRECTORIES(
+  ${CMAKE_SOURCE_DIR}/src/external
+  ${CMAKE_CURRENT_SOURCE_DIR}
+)
+
 ################ Sub Directories ################
 

code/trunk/src/modules/CMakeLists.txt

@@ -18 +18 @@
  #
 
+INCLUDE_DIRECTORIES(
+  ${CMAKE_SOURCE_DIR}/src/external
+  ${CMAKE_SOURCE_DIR}/src/libraries
+  ${CMAKE_SOURCE_DIR}/src/orxonox
+  ${CMAKE_CURRENT_SOURCE_DIR}
+)
+
 ################ Sub Directories ################
 

code/trunk/src/orxonox/CMakeLists.txt

@@ -17 +17 @@
  #     Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
  #
+
+INCLUDE_DIRECTORIES(
+  ${CMAKE_SOURCE_DIR}/src/external
+  ${CMAKE_SOURCE_DIR}/src/libraries
+  ${CMAKE_CURRENT_SOURCE_DIR}
+)
 
 SET_SOURCE_FILES(ORXONOX_SRC_FILES