From 0b0258c548d466e421ac8b0ab6e754d70f9d0df7 Mon Sep 17 00:00:00 2001 From: Brad King Date: Fri, 20 Apr 2007 09:49:27 -0400 Subject: [PATCH] BUG: Reverting previous change. It did not account for the possibility that the loaded command was built with a different compiler. --- Source/cmLoadCommandCommand.cxx | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) diff --git a/Source/cmLoadCommandCommand.cxx b/Source/cmLoadCommandCommand.cxx index 9634512f3..fe73ee853 100644 --- a/Source/cmLoadCommandCommand.cxx +++ b/Source/cmLoadCommandCommand.cxx @@ -290,7 +290,14 @@ bool cmLoadCommandCommand::InitialPass(std::vector const& args) 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)