From f430ad0ea25cd55bbc6be1d1627da03df260630d Mon Sep 17 00:00:00 2001 From: Brad King Date: Thu, 16 Mar 2006 17:20:09 -0500 Subject: BUG: Removed compiled-in CMAKE_SHARED_MODULE_PREFIX and CMAKE_SHARED_MODULE_SUFFIX for loaded commands in favor of using the settings from the platform files. --- Tests/Complex/Executable/complex.cxx | 4 ++-- Tests/Complex/cmTestConfigure.h.in | 3 +++ Tests/ComplexOneConfig/Executable/complex.cxx | 4 ++-- Tests/ComplexOneConfig/cmTestConfigure.h.in | 3 +++ Tests/ComplexRelativePaths/Executable/complex.cxx | 4 ++-- Tests/ComplexRelativePaths/cmTestConfigure.h.in | 3 +++ 6 files changed, 15 insertions(+), 6 deletions(-) diff --git a/Tests/Complex/Executable/complex.cxx b/Tests/Complex/Executable/complex.cxx index e07845c..81ef44e 100644 --- a/Tests/Complex/Executable/complex.cxx +++ b/Tests/Complex/Executable/complex.cxx @@ -325,9 +325,9 @@ int main() cmPassed("run Single Character executable A returned 10 as expected."); } - lib += cmDynamicLoader::LibPrefix(); + lib += CMAKE_SHARED_MODULE_PREFIX; lib += "CMakeTestModule"; - lib += cmDynamicLoader::LibExtension(); + lib += CMAKE_SHARED_MODULE_SUFFIX; cmsys::DynamicLoader::LibraryHandle handle = cmDynamicLoader::OpenLibrary(lib.c_str()); if(!handle) { diff --git a/Tests/Complex/cmTestConfigure.h.in b/Tests/Complex/cmTestConfigure.h.in index f2017ab..c8600cb 100644 --- a/Tests/Complex/cmTestConfigure.h.in +++ b/Tests/Complex/cmTestConfigure.h.in @@ -74,3 +74,6 @@ // Test SET CACHE FORCE #cmakedefine FORCE_TEST #define CMAKE_GENERATOR "${CMAKE_GENERATOR}" + +#define CMAKE_SHARED_MODULE_PREFIX "${CMAKE_SHARED_MODULE_PREFIX}" +#define CMAKE_SHARED_MODULE_SUFFIX "${CMAKE_SHARED_MODULE_SUFFIX}" diff --git a/Tests/ComplexOneConfig/Executable/complex.cxx b/Tests/ComplexOneConfig/Executable/complex.cxx index e07845c..81ef44e 100644 --- a/Tests/ComplexOneConfig/Executable/complex.cxx +++ b/Tests/ComplexOneConfig/Executable/complex.cxx @@ -325,9 +325,9 @@ int main() cmPassed("run Single Character executable A returned 10 as expected."); } - lib += cmDynamicLoader::LibPrefix(); + lib += CMAKE_SHARED_MODULE_PREFIX; lib += "CMakeTestModule"; - lib += cmDynamicLoader::LibExtension(); + lib += CMAKE_SHARED_MODULE_SUFFIX; cmsys::DynamicLoader::LibraryHandle handle = cmDynamicLoader::OpenLibrary(lib.c_str()); if(!handle) { diff --git a/Tests/ComplexOneConfig/cmTestConfigure.h.in b/Tests/ComplexOneConfig/cmTestConfigure.h.in index f2017ab..c8600cb 100644 --- a/Tests/ComplexOneConfig/cmTestConfigure.h.in +++ b/Tests/ComplexOneConfig/cmTestConfigure.h.in @@ -74,3 +74,6 @@ // Test SET CACHE FORCE #cmakedefine FORCE_TEST #define CMAKE_GENERATOR "${CMAKE_GENERATOR}" + +#define CMAKE_SHARED_MODULE_PREFIX "${CMAKE_SHARED_MODULE_PREFIX}" +#define CMAKE_SHARED_MODULE_SUFFIX "${CMAKE_SHARED_MODULE_SUFFIX}" diff --git a/Tests/ComplexRelativePaths/Executable/complex.cxx b/Tests/ComplexRelativePaths/Executable/complex.cxx index e07845c..81ef44e 100644 --- a/Tests/ComplexRelativePaths/Executable/complex.cxx +++ b/Tests/ComplexRelativePaths/Executable/complex.cxx @@ -325,9 +325,9 @@ int main() cmPassed("run Single Character executable A returned 10 as expected."); } - lib += cmDynamicLoader::LibPrefix(); + lib += CMAKE_SHARED_MODULE_PREFIX; lib += "CMakeTestModule"; - lib += cmDynamicLoader::LibExtension(); + lib += CMAKE_SHARED_MODULE_SUFFIX; cmsys::DynamicLoader::LibraryHandle handle = cmDynamicLoader::OpenLibrary(lib.c_str()); if(!handle) { diff --git a/Tests/ComplexRelativePaths/cmTestConfigure.h.in b/Tests/ComplexRelativePaths/cmTestConfigure.h.in index f2017ab..c8600cb 100644 --- a/Tests/ComplexRelativePaths/cmTestConfigure.h.in +++ b/Tests/ComplexRelativePaths/cmTestConfigure.h.in @@ -74,3 +74,6 @@ // Test SET CACHE FORCE #cmakedefine FORCE_TEST #define CMAKE_GENERATOR "${CMAKE_GENERATOR}" + +#define CMAKE_SHARED_MODULE_PREFIX "${CMAKE_SHARED_MODULE_PREFIX}" +#define CMAKE_SHARED_MODULE_SUFFIX "${CMAKE_SHARED_MODULE_SUFFIX}" -- cgit v0.12