From b282bb823323c26c917803834670913d8fa85d05 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Ad=C3=A8le=20Harrissart?= <adele.harrissart@gmail.com>
Date: Wed, 18 Jun 2014 10:16:27 +0200
Subject: [PATCH] Add eompi test folder for compilation.

---
 eompi/CMakeLists.txt      | 6 +++++-
 eompi/test/CMakeLists.txt | 7 +++----
 2 files changed, 8 insertions(+), 5 deletions(-)

diff --git a/eompi/CMakeLists.txt b/eompi/CMakeLists.txt
index d1a7e3d87..3810af37c 100644
--- a/eompi/CMakeLists.txt
+++ b/eompi/CMakeLists.txt
@@ -2,4 +2,8 @@
 ### Include subdirectories
 ######################################################################################
 #add_subdirectory(doc)
-add_subdirectory(src)
\ No newline at end of file
+add_subdirectory(src)
+
+if(ENABLE_CMAKE_TESTING)
+    add_subdirectory(test)
+endif(ENABLE_CMAKE_TESTING)
\ No newline at end of file
diff --git a/eompi/test/CMakeLists.txt b/eompi/test/CMakeLists.txt
index 325056da7..9a0f9656c 100644
--- a/eompi/test/CMakeLists.txt
+++ b/eompi/test/CMakeLists.txt
@@ -8,10 +8,9 @@
 ### 1) Include the sources
 ######################################################################################
 
-message("EO SOURCE DIR: ${EO_SRC_DIR}")
-message("OMPI: ${MPI_DIR}")
+message("EOMPI: ${EOMPI_DIR}")
 
-include_directories(${MPI_DIR}/include)
+include_directories(${EOMPI_SRC_DIR}/src)
 include_directories(${EO_SRC_DIR}/src)
 include_directories(${CMAKE_CURRENT_SOURCE_DIR})
 
@@ -20,7 +19,7 @@ include_directories(${CMAKE_CURRENT_SOURCE_DIR})
 ######################################################################################
 
 link_directories(${EO_BIN_DIR}/lib)
-link_directories(${MPI_DIR}/lib)
+link_directories(${EOMPI_BIN_DIR}/lib)
 
 ######################################################################################
 ### 3) Define your targets and link the librairies