Changeset 2641

Timestamp:

Feb 8, 2009, 11:52:37 PM (15 years ago)

Author:

rgrieder

Message:

• Update to boost 1.37: System library is now REQUIRED when finding boost even if you have less than boost 1.35. If this is problem, it's going to get quite ugly, but it's possible.
• Fixed a problem in cpptcl.cc: Boost 1.36 introduced boost::exception which conflicted with std::exception (cpptcl makes use of 'using namespace'…)
• Fixed two little bugs for tolua bind files and gcc warnings

Location:

code/branches/buildsystem2

Files:

• cmake/BuildConfigGCC.cmake (modified) (1 diff)
• cmake/LibraryConfig.cmake (modified) (1 diff)
• src/ceguilua/CMakeLists.txt (modified) (1 diff)
• src/core/CMakeLists.txt (modified) (1 diff)
• src/core/LuaBind.cc (modified) (1 diff)
• src/cpptcl/changes_orxonox.diff (modified) (1 diff)
• src/cpptcl/cpptcl.cc (modified) (3 diffs)
• src/orxonox/gui/GUIManager.cc (modified) (1 diff)
• src/tolua/lua/package.lua (modified) (1 diff)

code/branches/buildsystem2/cmake/BuildConfigGCC.cmake

@@ -37 +37 @@
 COMPARE_VERSION_STRINGS("${GCC_VERSION}" "4.0.0" _compare_result)
 IF(_compare_result LESS 0)
-  SET(GCC_NO_SYSTEM_HEADER_SUPPORT)
+  SET(GCC_NO_SYSTEM_HEADER_SUPPORT TRUE)
 ENDIF()
 

code/branches/buildsystem2/cmake/LibraryConfig.cmake

@@ -148 +148 @@
   FIND_PACKAGE(Boost 1.34 REQUIRED thread filesystem date_time system)
 ELSE(MSVC)
-  FIND_PACKAGE(Boost 1.34 REQUIRED thread filesystem)
+  FIND_PACKAGE(Boost 1.34 REQUIRED thread filesystem system)
 ENDIF(MSVC)
 

code/branches/buildsystem2/src/ceguilua/CMakeLists.txt

@@ -25 +25 @@
   ${CEGUILUA_DIR}/CEGUILuaFunctor.cpp
   ${CEGUILUA_DIR}/required.cpp
-  ${CEGUILUA_BINARY_DIR}/lua_CEGUI.cpp
+  ${CEGUILUA_BINARY_DIR}/${CMAKE_CFG_INTDIR}/lua_CEGUI.cpp
 
   ${CEGUILUA_DIR}/CEGUILua.h

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

@@ -80 +80 @@
   ${Boost_THREAD_LIBRARY}
   ${Boost_FILESYSTEM_LIBRARY}
-  ${Boost_SYSTEM_LIBRARY}    # MSVC only
+  ${Boost_SYSTEM_LIBRARY}
   ${Boost_DATE_TIME_LIBRARY} # MSVC only
   ${LUA_LIBRARIES}

code/branches/buildsystem2/src/core/LuaBind.cc

@@ -38 +38 @@
 #include <tolua/tolua++.h>
 
-#include "core/ToluaBindCore.h"
+#include "ToluaBindCore.h"
 #include "util/String.h"
 #include "CoreIncludes.h"

code/branches/buildsystem2/src/cpptcl/changes_orxonox.diff

@@ -1 @@
---- cpptcl.cc   Wed Jan 28 20:56:06 2009
-+++ cpptcl.cc   Sat Jan 24 12:52:54 2009
+--- cpptcl.cc   So Feb  8 23:14:34 2009
++++ cpptcl.cc   So Feb  8 23:13:07 2009
+@@ -320,7 +320,7 @@
+ 
+           post_process_policies(interp, pol, objv, false);
+      }
+-     catch (exception const &e)
++     catch (std::exception const &e)
+      {
+           Tcl_SetResult(interp, const_cast<char*>(e.what()), TCL_VOLATILE);
+           return TCL_ERROR;
+@@ -363,7 +363,7 @@
+ 
+           post_process_policies(interp, pol, objv, true);
+      }
+-     catch (exception const &e)
++     catch (std::exception const &e)
+      {
+           Tcl_SetResult(interp, const_cast<char*>(e.what()), TCL_VOLATILE);
+           return TCL_ERROR;
+@@ -430,7 +430,7 @@
+                Tcl_GetString(Tcl_GetObjResult(interp)),
+                object_handler, static_cast<ClientData>(chb), 0);
+      }
+-     catch (exception const &e)
++     catch (std::exception const &e)
+      {
+           Tcl_SetResult(interp, const_cast<char*>(e.what()), TCL_VOLATILE);
+           return TCL_ERROR;
 @@ -858,6 +858,18 @@
       owner_ = true;

code/branches/buildsystem2/src/cpptcl/cpptcl.cc

@@ -321 +321 @@
           post_process_policies(interp, pol, objv, false);
      }
-     catch (exception const &e)
+     catch (std::exception const &e)
      {
           Tcl_SetResult(interp, const_cast<char*>(e.what()), TCL_VOLATILE);
@@ -364 +364 @@
           post_process_policies(interp, pol, objv, true);
      }
-     catch (exception const &e)
+     catch (std::exception const &e)
      {
           Tcl_SetResult(interp, const_cast<char*>(e.what()), TCL_VOLATILE);
@@ -431 +431 @@
                object_handler, static_cast<ClientData>(chb), 0);
      }
-     catch (exception const &e)
+     catch (std::exception const &e)
      {
           Tcl_SetResult(interp, const_cast<char*>(e.what()), TCL_VOLATILE);

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

@@ -51 +51 @@
 #include "core/ConsoleCommand.h"
 #include "core/Core.h"
-#include "core/ToluaBindCore.h"
+#include "ToluaBindCore.h"
 #include "ToluaBindOrxonox.h"
 

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

@@ -129 +129 @@
         local header = gsub(flags.H, '^.-([%w_]*%.[%w_]*)$', '%1')
         local package_lower = string.lower(self.name)
-        output('#include "'..package_lower..'/'..header..'"\n')
+        output('#include "'..header..'"\n')
     end