[cmake-commits] king committed cmLoadCommandCommand.cxx 1.27 1.28

[cmake-commits at cmake.org]

Update of /cvsroot/CMake/CMake/Source
In directory public:/mounts/ram/cvs-serv30392

Modified Files:
	cmLoadCommandCommand.cxx 
Log Message:
BUG: Reverting previous change.  It did not account for the possibility that the loaded command was built with a different compiler.


Index: cmLoadCommandCommand.cxx
===================================================================
RCS file: /cvsroot/CMake/CMake/Source/cmLoadCommandCommand.cxx,v
retrieving revision 1.27
retrieving revision 1.28
diff -u -d -r1.27 -r1.28
--- cmLoadCommandCommand.cxx	19 Apr 2007 15:23:04 -0000	1.27
+++ cmLoadCommandCommand.cxx	20 Apr 2007 13:49:27 -0000	1.28
@@ -290,7 +290,14 @@
   CM_INIT_FUNCTION initFunction
     = (CM_INIT_FUNCTION)
     cmsys::DynamicLoader::GetSymbolAddress(lib, initFuncName.c_str());
-
+  if ( !initFunction )
+    {
+    initFuncName = "_";
+    initFuncName += args[0];
+    initFuncName += "Init";
+    initFunction = (CM_INIT_FUNCTION)(
+      cmsys::DynamicLoader::GetSymbolAddress(lib, initFuncName.c_str()));
+    }
   // if the symbol is found call it to set the name on the 
   // function blocker
   if(initFunction)