diff options
| author | Andy Cedilnik <andy.cedilnik@kitware.com> | 2006-03-16 16:01:05 (GMT) |
|---|---|---|
| committer | Andy Cedilnik <andy.cedilnik@kitware.com> | 2006-03-16 16:01:05 (GMT) |
| commit | f483e48d2a2f3361dcf3c60096bbfe9975f90ddf (patch) | |
| tree | 2909a53a3efb79bf633ba0be2fa93d7c7b68181f /Tests | |
| parent | 4102949bf95eee1ce88544fafdf80439aece85b2 (diff) | |
| download | CMake-f483e48d2a2f3361dcf3c60096bbfe9975f90ddf.zip CMake-f483e48d2a2f3361dcf3c60096bbfe9975f90ddf.tar.gz CMake-f483e48d2a2f3361dcf3c60096bbfe9975f90ddf.tar.bz2 | |
ENH: Cleanup DynamicLoader so that the symbols have more consistent names, start using dynamic loader from kwsys in CMake
Diffstat (limited to 'Tests')
| -rw-r--r-- | Tests/Complex/Executable/complex.cxx | 9 | ||||
| -rw-r--r-- | Tests/ComplexOneConfig/Executable/complex.cxx | 9 | ||||
| -rw-r--r-- | Tests/ComplexRelativePaths/Executable/complex.cxx | 9 |
3 files changed, 15 insertions, 12 deletions
diff --git a/Tests/Complex/Executable/complex.cxx b/Tests/Complex/Executable/complex.cxx index 67459d6..e07845c 100644 --- a/Tests/Complex/Executable/complex.cxx +++ b/Tests/Complex/Executable/complex.cxx @@ -15,6 +15,7 @@ extern "C" { #include "cmSystemTools.h" #include "cmOrderLinkDirectories.h" #include "cmGeneratedFileStream.h" +#include <cmsys/DynamicLoader.hxx> #else #include <vector> #include <string> @@ -327,7 +328,7 @@ int main() lib += cmDynamicLoader::LibPrefix(); lib += "CMakeTestModule"; lib += cmDynamicLoader::LibExtension(); - cmLibHandle handle = cmDynamicLoader::OpenLibrary(lib.c_str()); + cmsys::DynamicLoader::LibraryHandle handle = cmDynamicLoader::OpenLibrary(lib.c_str()); if(!handle) { std::string err = "Can not open CMakeTestModule:\n"; @@ -336,11 +337,11 @@ int main() } else { - cmDynamicLoaderFunction fun = - cmDynamicLoader::GetSymbolAddress(handle, "ModuleFunction"); + cmsys::DynamicLoader::SymbolPointer fun = + cmsys::DynamicLoader::GetSymbolAddress(handle, "ModuleFunction"); if(!fun) { - fun = cmDynamicLoader::GetSymbolAddress(handle, "_ModuleFunction"); + fun = cmsys::DynamicLoader::GetSymbolAddress(handle, "_ModuleFunction"); } typedef int (*TEST_FUNCTION)(); TEST_FUNCTION testFun = (TEST_FUNCTION)fun; diff --git a/Tests/ComplexOneConfig/Executable/complex.cxx b/Tests/ComplexOneConfig/Executable/complex.cxx index 67459d6..e07845c 100644 --- a/Tests/ComplexOneConfig/Executable/complex.cxx +++ b/Tests/ComplexOneConfig/Executable/complex.cxx @@ -15,6 +15,7 @@ extern "C" { #include "cmSystemTools.h" #include "cmOrderLinkDirectories.h" #include "cmGeneratedFileStream.h" +#include <cmsys/DynamicLoader.hxx> #else #include <vector> #include <string> @@ -327,7 +328,7 @@ int main() lib += cmDynamicLoader::LibPrefix(); lib += "CMakeTestModule"; lib += cmDynamicLoader::LibExtension(); - cmLibHandle handle = cmDynamicLoader::OpenLibrary(lib.c_str()); + cmsys::DynamicLoader::LibraryHandle handle = cmDynamicLoader::OpenLibrary(lib.c_str()); if(!handle) { std::string err = "Can not open CMakeTestModule:\n"; @@ -336,11 +337,11 @@ int main() } else { - cmDynamicLoaderFunction fun = - cmDynamicLoader::GetSymbolAddress(handle, "ModuleFunction"); + cmsys::DynamicLoader::SymbolPointer fun = + cmsys::DynamicLoader::GetSymbolAddress(handle, "ModuleFunction"); if(!fun) { - fun = cmDynamicLoader::GetSymbolAddress(handle, "_ModuleFunction"); + fun = cmsys::DynamicLoader::GetSymbolAddress(handle, "_ModuleFunction"); } typedef int (*TEST_FUNCTION)(); TEST_FUNCTION testFun = (TEST_FUNCTION)fun; diff --git a/Tests/ComplexRelativePaths/Executable/complex.cxx b/Tests/ComplexRelativePaths/Executable/complex.cxx index 67459d6..e07845c 100644 --- a/Tests/ComplexRelativePaths/Executable/complex.cxx +++ b/Tests/ComplexRelativePaths/Executable/complex.cxx @@ -15,6 +15,7 @@ extern "C" { #include "cmSystemTools.h" #include "cmOrderLinkDirectories.h" #include "cmGeneratedFileStream.h" +#include <cmsys/DynamicLoader.hxx> #else #include <vector> #include <string> @@ -327,7 +328,7 @@ int main() lib += cmDynamicLoader::LibPrefix(); lib += "CMakeTestModule"; lib += cmDynamicLoader::LibExtension(); - cmLibHandle handle = cmDynamicLoader::OpenLibrary(lib.c_str()); + cmsys::DynamicLoader::LibraryHandle handle = cmDynamicLoader::OpenLibrary(lib.c_str()); if(!handle) { std::string err = "Can not open CMakeTestModule:\n"; @@ -336,11 +337,11 @@ int main() } else { - cmDynamicLoaderFunction fun = - cmDynamicLoader::GetSymbolAddress(handle, "ModuleFunction"); + cmsys::DynamicLoader::SymbolPointer fun = + cmsys::DynamicLoader::GetSymbolAddress(handle, "ModuleFunction"); if(!fun) { - fun = cmDynamicLoader::GetSymbolAddress(handle, "_ModuleFunction"); + fun = cmsys::DynamicLoader::GetSymbolAddress(handle, "_ModuleFunction"); } typedef int (*TEST_FUNCTION)(); TEST_FUNCTION testFun = (TEST_FUNCTION)fun; |