kolan/CMake
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

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.

Browse Source
This commit is contained in:
Brad King 2006-03-16 17:20:09 -05:00
parent 1d38a3e09e
commit f430ad0ea2
6 changed files with 15 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
Tests/Complex/Executable/complex.cxx
View File

@ -325,9 +325,9 @@ int main()
cmPassed("run Single Character executable A returned 10 as expected."); cmPassed("run Single Character executable A returned 10 as expected.");
} }
lib += cmDynamicLoader::LibPrefix(); lib += CMAKE_SHARED_MODULE_PREFIX;
lib += "CMakeTestModule"; lib += "CMakeTestModule";
lib += cmDynamicLoader::LibExtension(); lib += CMAKE_SHARED_MODULE_SUFFIX;
cmsys::DynamicLoader::LibraryHandle handle = cmDynamicLoader::OpenLibrary(lib.c_str()); cmsys::DynamicLoader::LibraryHandle handle = cmDynamicLoader::OpenLibrary(lib.c_str());
if(!handle) if(!handle)
{ {

3
Tests/Complex/cmTestConfigure.h.in
View File

@ -74,3 +74,6 @@
// Test SET CACHE FORCE // Test SET CACHE FORCE
#cmakedefine FORCE_TEST #cmakedefine FORCE_TEST
#define CMAKE_GENERATOR "${CMAKE_GENERATOR}" #define CMAKE_GENERATOR "${CMAKE_GENERATOR}"
#define CMAKE_SHARED_MODULE_PREFIX "${CMAKE_SHARED_MODULE_PREFIX}"
#define CMAKE_SHARED_MODULE_SUFFIX "${CMAKE_SHARED_MODULE_SUFFIX}"

4
Tests/ComplexOneConfig/Executable/complex.cxx
View File

@ -325,9 +325,9 @@ int main()
cmPassed("run Single Character executable A returned 10 as expected."); cmPassed("run Single Character executable A returned 10 as expected.");
} }
lib += cmDynamicLoader::LibPrefix(); lib += CMAKE_SHARED_MODULE_PREFIX;
lib += "CMakeTestModule"; lib += "CMakeTestModule";
lib += cmDynamicLoader::LibExtension(); lib += CMAKE_SHARED_MODULE_SUFFIX;
cmsys::DynamicLoader::LibraryHandle handle = cmDynamicLoader::OpenLibrary(lib.c_str()); cmsys::DynamicLoader::LibraryHandle handle = cmDynamicLoader::OpenLibrary(lib.c_str());
if(!handle) if(!handle)
{ {

3
Tests/ComplexOneConfig/cmTestConfigure.h.in
View File

@ -74,3 +74,6 @@
// Test SET CACHE FORCE // Test SET CACHE FORCE
#cmakedefine FORCE_TEST #cmakedefine FORCE_TEST
#define CMAKE_GENERATOR "${CMAKE_GENERATOR}" #define CMAKE_GENERATOR "${CMAKE_GENERATOR}"
#define CMAKE_SHARED_MODULE_PREFIX "${CMAKE_SHARED_MODULE_PREFIX}"
#define CMAKE_SHARED_MODULE_SUFFIX "${CMAKE_SHARED_MODULE_SUFFIX}"

4
Tests/ComplexRelativePaths/Executable/complex.cxx
View File

@ -325,9 +325,9 @@ int main()
cmPassed("run Single Character executable A returned 10 as expected."); cmPassed("run Single Character executable A returned 10 as expected.");
} }
lib += cmDynamicLoader::LibPrefix(); lib += CMAKE_SHARED_MODULE_PREFIX;
lib += "CMakeTestModule"; lib += "CMakeTestModule";
lib += cmDynamicLoader::LibExtension(); lib += CMAKE_SHARED_MODULE_SUFFIX;
cmsys::DynamicLoader::LibraryHandle handle = cmDynamicLoader::OpenLibrary(lib.c_str()); cmsys::DynamicLoader::LibraryHandle handle = cmDynamicLoader::OpenLibrary(lib.c_str());
if(!handle) if(!handle)
{ {

3
Tests/ComplexRelativePaths/cmTestConfigure.h.in
View File

@ -74,3 +74,6 @@
// Test SET CACHE FORCE // Test SET CACHE FORCE
#cmakedefine FORCE_TEST #cmakedefine FORCE_TEST
#define CMAKE_GENERATOR "${CMAKE_GENERATOR}" #define CMAKE_GENERATOR "${CMAKE_GENERATOR}"
#define CMAKE_SHARED_MODULE_PREFIX "${CMAKE_SHARED_MODULE_PREFIX}"
#define CMAKE_SHARED_MODULE_SUFFIX "${CMAKE_SHARED_MODULE_SUFFIX}"