From 6b08293d0e32e7f3714d2a3c90ea0aa34a1b2ac4 Mon Sep 17 00:00:00 2001
From: Guilhem Lavaux <lavaux@iap.fr>
Date: Mon, 16 Jan 2017 14:00:50 +0100
Subject: [PATCH] Fixed paths for externals

---
 external/external_build.cmake | 8 ++++----
 src/CMakeLists.txt            | 4 ++--
 2 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/external/external_build.cmake b/external/external_build.cmake
index 9e76362..6982ae8 100644
--- a/external/external_build.cmake
+++ b/external/external_build.cmake
@@ -260,13 +260,13 @@ ENDIF(INTERNAL_EIGEN)
 
 
 SET(cosmotool_DEPS ${cosmotool_DEPS} omptl)
-SET(OMPTL_BUILD_DIR ${BUILD_PREFIX}/omptl-prefix)
+SET(OMPTL_BUILD_DIR ${BUILD_PREFIX}/omptl-prefix/src/omptl)
 ExternalProject_Add(omptl
-  PREFIX ${OMPTL_BUILD_DIR}
+  PREFIX ${BUILD_PREFIX}/omptl-prefix
   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 ${OMPTL_BUILD_DIR}/src/omptl ${CMAKE_BINARY_DIR}/external/stage/include/omptl
+  INSTALL_COMMAND ${CMAKE_COMMAND} -E copy_directory ${OMPTL_BUILD_DIR} ${CMAKE_BINARY_DIR}/ext_install/include/omptl
 )
-include_directories(${OMPTL_BUILD_DIR}/src/)
+##include_directories(${OMPTL_BUILD_DIR}/src/)
 
diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
index 1e5479f..6fff514 100644
--- a/src/CMakeLists.txt
+++ b/src/CMakeLists.txt
@@ -109,7 +109,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 ${OMPTL_BUILD_DIR}
+     DESTINATION include/CosmoTool)
 install(DIRECTORY . DESTINATION include/CosmoTool
 	FILES_MATCHING PATTERN "*.tcc")