From 4439fd069db57f96b1f27fa6f6e8443275043ca5 Mon Sep 17 00:00:00 2001
From: Pietro Incardona <incardon@mpi-cbg.de>
Date: Sat, 17 Oct 2020 09:45:36 +0200
Subject: [PATCH] Fixing typo in install
---
src/CMakeLists.txt | 2 +-
src/RawReader/InitGridWithPixel.hpp | 2 +-
src/util/PathsAndFiles.hpp | 9 +++------
3 files changed, 5 insertions(+), 8 deletions(-)
diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
index a88a096..49d873c 100644
--- a/src/CMakeLists.txt
+++ b/src/CMakeLists.txt
@@ -106,7 +106,7 @@ install(FILES HDF5_wr/HDF5_wr.hpp
DESTINATION openfpm_io/include/HDF5_wr)
install(FILES RawReader/InitGridWithPixel.hpp
- DESTINATION openfpm/io/include/RawReader/)
+ DESTINATION openfpm_io/include/RawReader/)
install(FILES util/PathsAndFiles.hpp
DESTINATION openfpm_io/include/util)
diff --git a/src/RawReader/InitGridWithPixel.hpp b/src/RawReader/InitGridWithPixel.hpp
index d68414a..01e23ec 100644
--- a/src/RawReader/InitGridWithPixel.hpp
+++ b/src/RawReader/InitGridWithPixel.hpp
@@ -24,7 +24,7 @@
#include "data_type/aggregate.hpp"
#include "Decomposition/CartDecomposition.hpp"
-#include "../redistancing_Sussman/HelpFunctionsForGrid.hpp"
+#include "level_set/redistancing_Sussman/HelpFunctionsForGrid.hpp"
typedef signed char BYTE;
/**@brief Read the number of pixels per dimension from a csv-file in order to create a grid with the same size.
*
diff --git a/src/util/PathsAndFiles.hpp b/src/util/PathsAndFiles.hpp
index d273e5c..e5cd27e 100644
--- a/src/util/PathsAndFiles.hpp
+++ b/src/util/PathsAndFiles.hpp
@@ -16,7 +16,7 @@
#include <iostream>
#include <fstream>
#include <boost/filesystem.hpp>
-/**@brief Gets the current working directory and returns path as string without the "cmake-build-debug".
+/**@brief Gets the current working directory and returns path as string.
*
* @return Std::string of path to current working directory.
*/
@@ -29,12 +29,9 @@ std::string get_cwd()
// convert current directory to string
std::string s_cwd;
s_cwd = cwd;
- // split string into file and path (to get rid of "cmake-build-debug" at the end of cwd)
- std::size_t botDirPos = s_cwd.find_last_of("/");
- std::string dir = s_cwd.substr(0, botDirPos);
- dir = dir + "/";
+
// std::cout << "The current working directory is: " << dir << std::endl;
- return dir;
+ return s_cwd;
}
/**@brief Checks if a file already exists.
*
--
GitLab