Changeset 629 for CMT/HEAD/source/cmt_constituent.cxx

Timestamp:

Jan 28, 2013, 2:41:55 PM (11 years ago)

Author:

rybkin

Message:

See C.L. 500

File:

• CMT/HEAD/source/cmt_constituent.cxx (modified) (5 diffs)

CMT/HEAD/source/cmt_constituent.cxx

@@ -16 +16 @@
 #include "cmt_database.h"
 #include "cmt_log.h"
+#include "cmt_error.h"
 
 /*----------------------------------------------------------*/
@@ -174 +175 @@
         m_constituent.need_prototypes = false;
       }
+    else if (w == "-modules")
+      {
+        if (m_constituent.type == Application ||
+            m_constituent.type == Library)
+          {
+            m_constituent.has_modules = true;
+          }
+      }
+    else if (w == "-no_modules")
+      {
+        if (m_constituent.type == Application ||
+            m_constituent.type == Library)
+          {
+            m_constituent.has_modules = false;
+          }
+      }
     else if (w == "-check")
       {
@@ -253 +270 @@
     else if (w.substr (0, 1) == "-")
       {
-        //if (!Cmt::get_quiet ())
-        //{
-        CmtMessage::warning ("bad option " + w + " in constituent " +
-                             m_constituent.name);
-        //      cerr << "#CMT> Warning: bad option " 
-        //           << w << " in constituent " << m_constituent.name << endl;
-        //CmtError::set (CmtError::execution_error, cmd);
-        //}
+        if (CmtMessage::active (Verbose))
+          CmtMessage::warning
+            (CmtError::get_error_name (CmtError::syntax_error)
+             + ": bad option " + w + " in constituent " + m_constituent.name);
       }
     else if ((equal = w.find ("=")) != cmt_string::npos)
@@ -522 +535 @@
   no_share        = false;
   need_prototypes = false;
+  has_modules     = false;
   need_check      = false;
   build_triggers  = false;
@@ -672 +686 @@
     }
   
+  if (type == Application || type == Library)
+    {
+      if (has_modules)
+        out << " -modules";
+      else
+        out << " -no_modules";
+    }
+  
   if (has_target_tag)
     {