Changeset 481 for CMT

Timestamp:

Nov 28, 2008, 9:17:46 PM (16 years ago)

Author:

rybkin

Message:

See C.L. 376

Location:

CMT/HEAD

Files:

• ChangeLog (modified) (1 diff)
• source/cmt_parser.cxx (modified) (3 diffs)

CMT/HEAD/ChangeLog

@@ +1 @@
+2008-11-28    <rybkin@lal.in2p3.fr> 376
+        
+        * source/cmt_parser.cxx: In function fill_for_all_constituents, ensure that
+        the <constituent>_use_linkopts macro is set in case the constituent
+        -import=<package> options constituent effectively import nothing
+
 2008-11-18    <rybkin@lal.in2p3.fr> 375
         

CMT/HEAD/source/cmt_parser.cxx

@@ -7614 +7614 @@
       {
         const Constituent& constituent = constituents[number];
+        
+        //==== GLAST addition for vs.net ==========
+        buffer = "macro ";
+        buffer += constituent.name;
+        buffer += "_GUID \"{88BF15AB-5A2D-4bea-B64F-02752C2A1F4F}\" ";
+        apply ();
         
         if (Cmt::get_debug ())
@@ -7765 +7771 @@
           }
         
+        /**
+         *  Only for linkopts we take care of the order. This means
+         *  that ${CONSTITUENT}_use_linkopts should be used in place of use_linkopts.
+         *
+         *  (see the application fragments)
+         *  that ${CONSTITUENT}_use_linkopts will be used in place of use_linkopts.
+         */
+        buffer = "macro_append ";
+        buffer += constituent.name;
+        buffer += "_use_linkopts ";
+        buffer += " \" ";
+        
+        current_use->fill_macro (buffer, "linkopts");
+        
+        for (i = 0; i < Uses.size (); i++)
+          {
+            if (auto_imports_states[i])
+              {
+                Use* u = Uses[i];
+                
+                if (u->discarded) continue;
+                if (u->m_hidden) continue;
+                
+                Package* p = u->get_package ();
+                if (p->is_cmt ()) continue;
+                
+                u->fill_macro (buffer, "linkopts");
+              }
+          }
+        buffer += "\"";
+        apply ();
+        
         if (imports.size () == 0) continue;
         
@@ -7890 +7928 @@
         apply ();
         */
-        
-        /**
-         *  Only for linkopts we take care of the order. This means
-         *  that ${CONSTITUENT}_use_linkopts should be used in place of use_linkopts.
-         *
-         *  (see the application fragments)
-         *  that ${CONSTITUENT}_use_linkopts will be used in place of use_linkopts.
-         */
-        buffer = "macro_append ";
-        buffer += constituent.name;
-        buffer += "_use_linkopts ";
-        buffer += " \" ";
-        
-        current_use->fill_macro (buffer, "linkopts");
-        
-        for (i = 0; i < Uses.size (); i++)
-          {
-            if (auto_imports_states[i])
-              {
-                Use* u = Uses[i];
-                
-                if (u->discarded) continue;
-                if (u->m_hidden) continue;
-                
-                Package* p = u->get_package ();
-                if (p->is_cmt ()) continue;
-                
-                u->fill_macro (buffer, "linkopts");
-              }
-          }
-        buffer += "\"";
-        apply ();
-        
-        //==== GLAST addition for vs.net ==========
-        buffer = "macro ";
-        buffer += constituent.name;
-        buffer += "_GUID \"{88BF15AB-5A2D-4bea-B64F-02752C2A1F4F}\" ";
-        apply ();
       }
   }