From b89dbe0987a6bb48fc4549dbf1a3563e37d675a7 Mon Sep 17 00:00:00 2001
From: Guilhem Lavaux <lavaux@iap.fr>
Date: Thu, 22 May 2014 09:27:53 +0200
Subject: [PATCH] Finished packaging omptl

---
 CMakeLists.txt     | 4 +++-
 src/CMakeLists.txt | 2 ++
 src/mykdtree.tcc   | 1 +
 3 files changed, 6 insertions(+), 1 deletion(-)

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 880f616..135b5ab 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -50,12 +50,14 @@ if (ENABLE_SHARP)
   SET(SHARP_INCLUDE_PATH ${DEP_BUILD}/include)
 endif (ENABLE_SHARP)
 
+SET(OMPTL_BUILD_DIR ${CMAKE_BINARY_DIR}/omptl-prefix/src/omptl)
 ExternalProject_Add(omptl
   URL ${CMAKE_SOURCE_DIR}/external/omptl-20120422.tar.bz2
   CONFIGURE_COMMAND echo "No configure"
   BUILD_COMMAND echo "No build"
-  INSTALL_COMMAND ${CMAKE_COMMAND} -E copy_directory ${CMAKE_BINARY_DIR}/omptl-prefix/src/omptl ${CMAKE_BINARY_DIR}/external/stage/include/omptl
+  INSTALL_COMMAND ${CMAKE_COMMAND} -E copy_directory ${OMPTL_BUILD_DIR} ${CMAKE_BINARY_DIR}/external/stage/include/omptl
 )
+include_directories(${OMPTL_BUILD_DIR}/..)
 
 set(HDF5_FIND_COMPONENTS HL CXX)
 if(HDF5_ROOTDIR)
diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
index 611deaa..ea15ca3 100644
--- a/src/CMakeLists.txt
+++ b/src/CMakeLists.txt
@@ -89,5 +89,7 @@ endif (BUILD_SHARED_LIBS)
 
 install(DIRECTORY . DESTINATION include/CosmoTool
 	FILES_MATCHING PATTERN "*.hpp")
+install(DIRECTORY ${OMPTL_BUILD_DIR} 
+     DESTINATION include/CosmoTool/omptl)
 install(DIRECTORY . DESTINATION include/CosmoTool
 	FILES_MATCHING PATTERN "*.tcc")
diff --git a/src/mykdtree.tcc b/src/mykdtree.tcc
index e276cad..3d66564 100644
--- a/src/mykdtree.tcc
+++ b/src/mykdtree.tcc
@@ -1,5 +1,6 @@
 #include "replicateGenerator.hpp"
 #include <cstring>
+#include "omptl/omptl_algorithm"
 #include <algorithm>
 #include <limits>
 #include <iostream>