[Orxonox-commit 2745] r7450 - in code/trunk/src: . libraries/util

[rgrieder at orxonox.net]

Author: rgrieder
Date: 2010-09-13 23:30:06 +0200 (Mon, 13 Sep 2010)
New Revision: 7450

Modified:
   code/trunk/src/CMakeLists.txt
   code/trunk/src/SpecialConfig.h.in
   code/trunk/src/libraries/util/SignalHandler.cc
Log:
- Catched -> Caught
- No idea why OROXNOX_USE_WINMAIN was at the bottom of SpecialConfig.h.in
- Empty variables do nothing in CMake

Modified: code/trunk/src/CMakeLists.txt
===================================================================
--- code/trunk/src/CMakeLists.txt	2010-09-13 21:12:21 UTC (rev 7449)
+++ code/trunk/src/CMakeLists.txt	2010-09-13 21:30:06 UTC (rev 7450)
@@ -83,6 +83,7 @@
   ${DIRECTX_INCLUDE_DIR}
   ${ZLIB_INCLUDE_DIR}
   ${VLD_INCLUDE_DIR}
+  ${DBGHELP_INCLUDE_DIR}
 
   # All includes in "externals" should be prefixed with the path
   # relative to "external" to avoid conflicts
@@ -99,10 +100,6 @@
   INCLUDE_DIRECTORIES(${CMAKE_CURRENT_SOURCE_DIR}/external/ceguilua/ceguilua-${CEGUI_VERSION})
 ENDIF()
 
-IF (DBGHELP_FOUND)
-  INCLUDE_DIRECTORIES(${DBGHELP_INCLUDE_DIR})
-ENDIF()
-
 ################### Tolua Bind ##################
 
 # Create directory because the tolua application doesn't work otherwise

Modified: code/trunk/src/SpecialConfig.h.in
===================================================================
--- code/trunk/src/SpecialConfig.h.in	2010-09-13 21:12:21 UTC (rev 7449)
+++ code/trunk/src/SpecialConfig.h.in	2010-09-13 21:30:06 UTC (rev 7450)
@@ -51,6 +51,8 @@
 
 #cmakedefine DBGHELP_FOUND                  ///< If DbgHelp was found on windows
 
+#cmakedefine ORXONOX_USE_WINMAIN            ///< Using MSVC or XCode IDE
+
 // Handle default ConfigValues
 namespace orxonox { namespace specialConfig
 {
@@ -108,6 +110,4 @@
 #endif
 } }
 
-#cmakedefine ORXONOX_USE_WINMAIN  ///< Using MSVC or XCode IDE
-
 #endif /* _SpecialConfig_H__ */

Modified: code/trunk/src/libraries/util/SignalHandler.cc
===================================================================
--- code/trunk/src/libraries/util/SignalHandler.cc	2010-09-13 21:12:21 UTC (rev 7449)
+++ code/trunk/src/libraries/util/SignalHandler.cc	2010-09-13 21:30:06 UTC (rev 7450)
@@ -382,11 +382,11 @@
             // if the signalhandler has already been destroyed then don't do anything
             if (SignalHandler::singletonPtr_s == 0)
             {
-                COUT(1) << "Catched an unhandled exception" << std::endl << "Can't write backtrace because SignalHandler is already destroyed" << std::endl;
+                COUT(1) << "Caught an unhandled exception" << std::endl << "Can't write backtrace because SignalHandler is already destroyed" << std::endl;
                 exit(EXIT_FAILURE);
             }
 
-            COUT(1) << "Catched an unhandled exception" << std::endl << "Try to write backtrace to orxonox_crash.log..." << std::endl;
+            COUT(1) << "Caught an unhandled exception" << std::endl << "Try to write backtrace to orxonox_crash.log..." << std::endl;
 
             // write the crash log
             std::ofstream crashlog(SignalHandler::getInstance().filename_.c_str());