فهرست منبع

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.

Brad King 20 سال پیش
والد
کامیت
f430ad0ea2

+ 2 - 2
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)
     {

+ 3 - 0
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}"

+ 2 - 2
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)
     {

+ 3 - 0
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}"

+ 2 - 2
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)
     {

+ 3 - 0
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}"