From 0853ce83ffb88058f4d2c777cf9a8d73b5460bde Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Petr=20Mr=C3=A1zek?= Date: Sat, 31 Oct 2009 18:18:59 +0000 Subject: [PATCH] update --- library/CMakeLists.txt | 2 +- tools/attachtest.cpp | 3 ++- tools/cleanmap.cpp | 1 + tools/expbench.cpp | 1 + tools/prospector.cpp | 1 + tools/reveal.cpp | 1 + 6 files changed, 7 insertions(+), 2 deletions(-) diff --git a/library/CMakeLists.txt b/library/CMakeLists.txt index e2b718d51..11bf09a83 100644 --- a/library/CMakeLists.txt +++ b/library/CMakeLists.txt @@ -44,7 +44,7 @@ SET_SOURCE_FILES_PROPERTIES( ${PROJECT_HDRS} PROPERTIES HEADER_FILE_ONLY TRUE ) LIST(APPEND PROJECT_SRCS ${PROJECT_HDRS}) -SET( MEMXML_DATA_PATH ${CMAKE_INSTALL_PREFIX} CACHE PATH "search path for Memory.xml") +SET( MEMXML_DATA_PATH . CACHE PATH "search path for Memory.xml") # OPTION( VARIABLE "Description" Initial state) #OPTION( WITH_FOO "Enable FOO support" ON ) #OPTION( WITH_BAR "Enable BAR component" OFF ) diff --git a/tools/attachtest.cpp b/tools/attachtest.cpp index 82ba86529..e8d839917 100644 --- a/tools/attachtest.cpp +++ b/tools/attachtest.cpp @@ -64,10 +64,11 @@ int main (void) time(&end); time_diff = difftime(end, start); - + DF.Detach(); cout << "attach tests done in " << time_diff << " seconds." << endl; cout << "Press any key to continue" << endl; cin.ignore(); + delete pDF; return 0; } \ No newline at end of file diff --git a/tools/cleanmap.cpp b/tools/cleanmap.cpp index d67f8273b..a46bec338 100644 --- a/tools/cleanmap.cpp +++ b/tools/cleanmap.cpp @@ -47,6 +47,7 @@ int main (void) } } } + DF.Detach(); delete pDF; cout << "Done. Press any key to continue" << endl; cin.ignore(); diff --git a/tools/expbench.cpp b/tools/expbench.cpp index f00dfe8f5..fd6f40b3f 100644 --- a/tools/expbench.cpp +++ b/tools/expbench.cpp @@ -57,6 +57,7 @@ int main (void) } } } + DF.Detach(); time(&end); time_diff = difftime(end, start); cout << num_blocks << " blocks read" << endl; diff --git a/tools/prospector.cpp b/tools/prospector.cpp index a85c98bc0..183097d8f 100644 --- a/tools/prospector.cpp +++ b/tools/prospector.cpp @@ -170,6 +170,7 @@ int main (int argc, const char* argv[]) { cout << stonetypes[p->first].id << " : " << p->second << endl; } + DF.Detach(); cin.ignore(); delete pDF; return 0; diff --git a/tools/reveal.cpp b/tools/reveal.cpp index fd74b2695..f64fdaa0a 100644 --- a/tools/reveal.cpp +++ b/tools/reveal.cpp @@ -47,6 +47,7 @@ int main (void) } } } + DF.Detach(); delete pDF; cout << "Done. Press any key to continue" << endl; cin.ignore();