ENH: Created method cmTarget::GetExportMacro to centralize computation of the export symbol name. This removes duplicate code from all the generators. Also enabled the export definition for executable targets with the ENABLE_EXPORTS property set.

1 files changed, 4 insertions, 9 deletions

diff --git a/Source/cmLocalVisualStudio6Generator.cxx b/Source/cmLocalVisualStudio6Generator.cxx
index 40ba473..24a381a 100644
--- a/Source/cmLocalVisualStudio6Generator.cxx
+++ b/Source/cmLocalVisualStudio6Generator.cxx
@@ -1289,18 +1289,13 @@ void cmLocalVisualStudio6Generator
       staticLibOptions = libflags;
       }
     }
+
+  // Add the export symbol definition for shared library objects.
   std::string exportSymbol;
-  if (const char* custom_export_name = target.GetProperty("DEFINE_SYMBOL"))
+  if(const char* exportMacro = target.GetExportMacro())
     {
-    exportSymbol = custom_export_name;
+    exportSymbol = exportMacro;
     }
-  else
-    {
-    std::string in = libName;
-    in += "_EXPORTS";
-    exportSymbol = cmSystemTools::MakeCindentifier(in.c_str());
-    }
-
 
   std::string line;
   while(cmSystemTools::GetLineFromStream(fin, line))