diff options
| author | Brad King <brad.king@kitware.com> | 2007-04-20 13:49:27 (GMT) |
|---|---|---|
| committer | Brad King <brad.king@kitware.com> | 2007-04-20 13:49:27 (GMT) |
| commit | 0b0258c548d466e421ac8b0ab6e754d70f9d0df7 (patch) | |
| tree | eff0c745e8c16e8e4953936515f010f99849a68e | |
| parent | b85d7d9c66cca3f967785ed82b4180a0430035fd (diff) | |
| download | CMake-0b0258c548d466e421ac8b0ab6e754d70f9d0df7.zip CMake-0b0258c548d466e421ac8b0ab6e754d70f9d0df7.tar.gz CMake-0b0258c548d466e421ac8b0ab6e754d70f9d0df7.tar.bz2 | |
BUG: Reverting previous change. It did not account for the possibility that the loaded command was built with a different compiler.
| -rw-r--r-- | Source/cmLoadCommandCommand.cxx | 9 |
1 files changed, 8 insertions, 1 deletions
diff --git a/Source/cmLoadCommandCommand.cxx b/Source/cmLoadCommandCommand.cxx index 9634512..fe73ee8 100644 --- a/Source/cmLoadCommandCommand.cxx +++ b/Source/cmLoadCommandCommand.cxx @@ -290,7 +290,14 @@ bool cmLoadCommandCommand::InitialPass(std::vector<std::string> 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) |