From 36136185443793d3a46f58cdf63ab53da0e24a67 Mon Sep 17 00:00:00 2001
From: Benjamin Bouvier <bnjbouv@gmail.com>
Date: Tue, 24 Jul 2012 16:36:10 +0200
Subject: [PATCH] Updated compilation system so as to remove dependance to
 Boost.

---
 eo/eo-conf.cmake           | 1 -
 eo/src/CMakeLists.txt      | 6 +-----
 eo/test/CMakeLists.txt     | 2 --
 eo/test/mpi/CMakeLists.txt | 5 +----
 4 files changed, 2 insertions(+), 12 deletions(-)

diff --git a/eo/eo-conf.cmake b/eo/eo-conf.cmake
index 1f5ee815..13fd720a 100644
--- a/eo/eo-conf.cmake
+++ b/eo/eo-conf.cmake
@@ -13,5 +13,4 @@ SET(WITH_OMP FALSE CACHE BOOL "Use OpenMP ?" FORCE)
 
 SET(WITH_MPI FALSE CACHE BOOL "Use mpi ?" FORCE)
 SET(MPI_DIR "/mpi/directory" CACHE PATH "OpenMPI directory" FORCE)
-SET(BOOST_DIR "/boost/directory" CACHE PATH "Boost directory" FORCE)
 
diff --git a/eo/src/CMakeLists.txt b/eo/src/CMakeLists.txt
index caeb673a..6509908a 100644
--- a/eo/src/CMakeLists.txt
+++ b/eo/src/CMakeLists.txt
@@ -9,23 +9,19 @@ INCLUDE_DIRECTORIES(${CMAKE_CURRENT_SOURCE_DIR})
 ######################################################################################
 
 IF(WITH_MPI)
-    MESSAGE("[EO] Compilation with MPI and BoostMPI.")
+    MESSAGE("[EO] Compilation with MPI.")
 
     SET(CMAKE_CXX_COMPILER "${MPI_DIR}/bin/mpicxx")
 
     # headers location
     INCLUDE_DIRECTORIES(${MPI_DIR}/include)
-    INCLUDE_DIRECTORIES(${BOOST_DIR}/include)
 
     # lib location
     LINK_DIRECTORIES(${MPI_DIR}/lib)
-    LINK_DIRECTORIES(${BOOST_DIR}/lib)
 
     # for conditional compilation in code
     ADD_DEFINITIONS(-DWITH_MPI)
 
-    LINK_LIBRARIES(boost_mpi boost_serialization)
-
     ADD_SUBDIRECTORY(mpi)
 ENDIF()
 
diff --git a/eo/test/CMakeLists.txt b/eo/test/CMakeLists.txt
index 8bf8b500..e3a5a624 100644
--- a/eo/test/CMakeLists.txt
+++ b/eo/test/CMakeLists.txt
@@ -15,7 +15,6 @@ INCLUDE_DIRECTORIES(${EO_SOURCE_DIR}/contrib/MGE)
 INCLUDE_DIRECTORIES(${CMAKE_CURRENT_SOURCE_DIR})
 
 IF(WITH_MPI)
-    INCLUDE_DIRECTORIES(${BOOST_DIR}/include)
     INCLUDE_DIRECTORIES(${MPI_DIR}/include)
 ENDIF()
 
@@ -26,7 +25,6 @@ ENDIF()
 LINK_DIRECTORIES(${EO_BINARY_DIR}/lib)
 
 IF(WITH_MPI)
-    LINK_DIRECTORIES(${BOOST_DIR}/lib)
     LINK_DIRECTORIES(${MPI_DIR}/lib)
     SET(CMAKE_CXX_COMPILER "${MPI_DIR}/bin/mpicxx")
 ENDIF()
diff --git a/eo/test/mpi/CMakeLists.txt b/eo/test/mpi/CMakeLists.txt
index 37b1227f..f83ecd45 100644
--- a/eo/test/mpi/CMakeLists.txt
+++ b/eo/test/mpi/CMakeLists.txt
@@ -10,10 +10,8 @@
 
 MESSAGE("EO SOURCE DIR: ${EO_SOURCE_DIR}")
 MESSAGE("OMPI: ${MPI_DIR}")
-MESSAGE("BOOST: ${BOOST_DIR}")
 
 INCLUDE_DIRECTORIES(${MPI_DIR}/include)
-INCLUDE_DIRECTORIES(${BOOST_DIR}/include)
 INCLUDE_DIRECTORIES(${EO_SOURCE_DIR}/src)
 INCLUDE_DIRECTORIES(${CMAKE_CURRENT_SOURCE_DIR})
 
@@ -23,7 +21,6 @@ INCLUDE_DIRECTORIES(${CMAKE_CURRENT_SOURCE_DIR})
 
 LINK_DIRECTORIES(${EO_BINARY_DIR}/lib)
 LINK_DIRECTORIES(${MPI_DIR}/lib)
-LINK_DIRECTORIES(${BOOST_DIR}/lib)
 
 ######################################################################################
 ### 3) Define your targets and link the librairies
@@ -47,7 +44,7 @@ IF(ENABLE_CMAKE_TESTING)
     FOREACH (test ${TEST_LIST})
     ADD_EXECUTABLE(${test} ${T_${test}_SOURCES})
     ADD_TEST(${test} ${test})
-    TARGET_LINK_LIBRARIES(${test} boost_mpi boost_serialization eoutils eompi eoserial eo)
+    TARGET_LINK_LIBRARIES(${test} eoutils eompi eoserial eo)
     INSTALL(TARGETS ${test} RUNTIME DESTINATION share/eo/test COMPONENT test)
     ENDFOREACH (test)
 ENDIF()