[Orxonox-commit 2648] r7353 - in code/branches/doc: doc/api src/orxonox

[rgrieder at orxonox.net]

Author: rgrieder
Date: 2010-09-05 02:15:47 +0200 (Sun, 05 Sep 2010)
New Revision: 7353

Modified:
   code/branches/doc/doc/api/CMakeLists.txt
   code/branches/doc/src/orxonox/Main.cc
Log:
Fixed bug. No comment...

Modified: code/branches/doc/doc/api/CMakeLists.txt
===================================================================
--- code/branches/doc/doc/api/CMakeLists.txt	2010-09-04 21:33:02 UTC (rev 7352)
+++ code/branches/doc/doc/api/CMakeLists.txt	2010-09-05 00:15:47 UTC (rev 7353)
@@ -54,7 +54,7 @@
   ADD_CUSTOM_COMMAND(
     OUTPUT ${INTERNAL_DOCFILE}
     COMMAND orxonox-main
-    ARGS --noIOConsole --generateDoc ${INTERNAL_DOCFILE}
+    ARGS --noIOConsole --generateDoc --docFile ${INTERNAL_DOCFILE}
     WORKING_DIRECTORY ${_working_dir}
     COMMENT "Generating additional Doxygen documentation from Orxonox executable"
   )

Modified: code/branches/doc/src/orxonox/Main.cc
===================================================================
--- code/branches/doc/src/orxonox/Main.cc	2010-09-04 21:33:02 UTC (rev 7352)
+++ code/branches/doc/src/orxonox/Main.cc	2010-09-05 00:15:47 UTC (rev 7353)
@@ -61,8 +61,11 @@
     SetCommandLineSwitch(dedicatedClient).information("Start in dedicated client mode");
 
     //! @cmdarg
-    SetCommandLineArgument(generateDoc, "Internal.dox")
+    SetCommandLineSwitch(generateDoc)
         .information("Generates a Doxygen file from things like SetConsoleCommand");
+    //! @cmdarg
+    SetCommandLineArgument(docFile, "Internal.dox")
+        .information("Name of the doc file to be generated with --generateDoc");
 
     /**
     @brief
@@ -72,11 +75,11 @@
     {
         Game* game = new Game(strCmdLine);
 
-        if (CommandLineParser::existsArgument("generateDoc"))
+        if (CommandLineParser::getValue("generateDoc").getBool())
         {
             // Generate additional documentation written to ONE file
             std::string filename;
-            CommandLineParser::getValue("generateDoc", &filename);
+            CommandLineParser::getValue("docFile", &filename);
         }
         else
         {