summaryrefslogtreecommitdiffstats
path: root/Source/kwsys/testDynamicLoader.cxx
diff options
context:
space:
mode:
authorMathieu Malaterre <mathieu.malaterre@gmail.com>2006-03-10 20:08:40 (GMT)
committerMathieu Malaterre <mathieu.malaterre@gmail.com>2006-03-10 20:08:40 (GMT)
commitfe66b15da4fa8060abb191235ef2450b9dca82bf (patch)
tree78d8cf2849fc4b08365060778849f8c024ab132a /Source/kwsys/testDynamicLoader.cxx
parent862f5df25c509e2df59d00597b0c4b4d14cf5eaa (diff)
downloadCMake-fe66b15da4fa8060abb191235ef2450b9dca82bf.zip
CMake-fe66b15da4fa8060abb191235ef2450b9dca82bf.tar.gz
CMake-fe66b15da4fa8060abb191235ef2450b9dca82bf.tar.bz2
BUG: Fix problem with in the path
Diffstat (limited to 'Source/kwsys/testDynamicLoader.cxx')
-rw-r--r--Source/kwsys/testDynamicLoader.cxx7
1 files changed, 6 insertions, 1 deletions
diff --git a/Source/kwsys/testDynamicLoader.cxx b/Source/kwsys/testDynamicLoader.cxx
index 1d2841a..2719fa1 100644
--- a/Source/kwsys/testDynamicLoader.cxx
+++ b/Source/kwsys/testDynamicLoader.cxx
@@ -31,6 +31,11 @@ kwsys_stl::string GetLibName(const char* lname)
{
// Construct proper name of lib
kwsys_stl::string slname;
+ slname = EXECUTABLE_OUTPUT_PATH;
+#ifdef CMAKE_INTDIR
+ slname += CMAKE_INTDIR;
+ slname += "/";
+#endif
slname = kwsys::DynamicLoader::LibPrefix();
slname += lname;
slname += kwsys::DynamicLoader::LibExtension();
@@ -86,7 +91,7 @@ int main(int , char *[])
res += TestDynamicLoader("libdl.so", "TestDynamicLoader",1,0,1);
#endif
// Now try on the generated library
- kwsys_stl::string libname = TEST_DYNLOAD_LOCATION; //GetLibName("testDynload");
+ kwsys_stl::string libname = GetLibName("testDynload");
res += TestDynamicLoader(libname.c_str(), "dummy",1,0,1);
res += TestDynamicLoader(libname.c_str(), "TestDynamicLoaderFunction",1,1,1);
res += TestDynamicLoader(libname.c_str(), "_TestDynamicLoaderFunction",1,0,1);