From 90d7931329f89da6b3f675c55c4b9f13281f7bcf Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ad=C3=A8le=20Harrissart?= Date: Wed, 23 Jul 2014 15:18:53 +0200 Subject: [PATCH] Compilation problems solved. --- eo/src/utils/eoTimer.h | 2 +- eompi/test/CMakeLists.txt | 2 ++ eompi/test/t-mpi-eval.cpp | 2 +- 3 files changed, 4 insertions(+), 2 deletions(-) diff --git a/eo/src/utils/eoTimer.h b/eo/src/utils/eoTimer.h index e9d39affd..7ba28c931 100644 --- a/eo/src/utils/eoTimer.h +++ b/eo/src/utils/eoTimer.h @@ -30,7 +30,7 @@ Authors: # include "utils/eoParallel.h" // eo::parallel -# include "eoSerial.h" // eo::Persistent +# include // eo::Persistent /** * @brief Timer allowing to measure time between a start point and a stop point. diff --git a/eompi/test/CMakeLists.txt b/eompi/test/CMakeLists.txt index 9a0f9656c..0a55d05d5 100644 --- a/eompi/test/CMakeLists.txt +++ b/eompi/test/CMakeLists.txt @@ -11,6 +11,7 @@ message("EOMPI: ${EOMPI_DIR}") include_directories(${EOMPI_SRC_DIR}/src) +include_directories(${EOSERIAL_SRC_DIR}/src) include_directories(${EO_SRC_DIR}/src) include_directories(${CMAKE_CURRENT_SOURCE_DIR}) @@ -20,6 +21,7 @@ include_directories(${CMAKE_CURRENT_SOURCE_DIR}) link_directories(${EO_BIN_DIR}/lib) link_directories(${EOMPI_BIN_DIR}/lib) +link_directories(${EOSERIAL_BIN_DIR}/lib) ###################################################################################### ### 3) Define your targets and link the librairies diff --git a/eompi/test/t-mpi-eval.cpp b/eompi/test/t-mpi-eval.cpp index c34ab1aab..d90bbd3c2 100644 --- a/eompi/test/t-mpi-eval.cpp +++ b/eompi/test/t-mpi-eval.cpp @@ -30,7 +30,7 @@ Authors: #include #include -#include "../real_value.h" +#include "../../eo/test/real_value.h" #include