Changeset 7353

Timestamp:

Sep 5, 2010, 2:15:47 AM (14 years ago)

Author:

rgrieder

Message:

Fixed bug. No comment…

Location:

code/branches/doc

Files:

• doc/api/CMakeLists.txt (modified) (1 diff)
• src/orxonox/Main.cc (modified) (2 diffs)

code/branches/doc/doc/api/CMakeLists.txt

@@ -55 +55 @@
     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"

code/branches/doc/src/orxonox/Main.cc

@@ -62 +62 @@
 
     //! @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");
 
     /**
@@ -73 +76 @@
         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