From 4fc6491ae2ee7e02950bf4dc8c027210fb127f76 Mon Sep 17 00:00:00 2001
From: vrouvrea <vrouvrea@636b058d-ea47-450e-bf9e-a15bfbe3eedb>
Date: Sat, 7 Jan 2017 14:09:55 +0000
Subject: Fix user version for patches Bad include type in
 CGAL/Orthogonal_incremental_neighbor_search.h

git-svn-id: svn+ssh://scm.gforge.inria.fr/svnroot/gudhi/trunk@1935 636b058d-ea47-450e-bf9e-a15bfbe3eedb

Former-commit-id: 1fc3888dd7af8624d3b501b32b76194215e0b7cf
---
 src/cmake/modules/GUDHI_user_version_target.txt           | 15 +++++++++++++++
 .../CGAL/Orthogonal_incremental_neighbor_search.h         |  3 +--
 2 files changed, 16 insertions(+), 2 deletions(-)

(limited to 'src')

diff --git a/src/cmake/modules/GUDHI_user_version_target.txt b/src/cmake/modules/GUDHI_user_version_target.txt
index 25db1c87..63301413 100644
--- a/src/cmake/modules/GUDHI_user_version_target.txt
+++ b/src/cmake/modules/GUDHI_user_version_target.txt
@@ -96,6 +96,21 @@ if (NOT CMAKE_VERSION VERSION_LESS 2.8.11)
       endif()
     endforeach()
   
+    # Patches
+    file(GLOB GUDHI_PATCHES_FILES ${CMAKE_SOURCE_DIR}/src/${GUDHI_MODULE}/include/gudhi_patches/*)
+
+    foreach(GUDHI_PATCHES_FILE ${GUDHI_PATCHES_FILES})
+      get_filename_component(GUDHI_PATCHES_FILE_NAME ${GUDHI_PATCHES_FILE} NAME)
+      # GUDHI_PATCHES_FILE can be a file or a directory
+      if(IS_DIRECTORY ${GUDHI_PATCHES_FILE})
+        add_custom_command(TARGET user_version PRE_BUILD COMMAND ${CMAKE_COMMAND} -E
+                           copy_directory ${GUDHI_PATCHES_FILE} ${GUDHI_USER_VERSION_DIR}/include/gudhi/${GUDHI_PATCHES_FILE_NAME})
+      else()
+        add_custom_command(TARGET user_version PRE_BUILD COMMAND ${CMAKE_COMMAND} -E
+                           copy ${GUDHI_PATCHES_FILE} ${GUDHI_USER_VERSION_DIR}/include/gudhi/${GUDHI_PATCHES_FILE_NAME})
+      endif()
+    endforeach()
+
     # concept files
     file(GLOB GUDHI_CONCEPT_FILES ${CMAKE_SOURCE_DIR}/src/${GUDHI_MODULE}/concept/*.h)
   
diff --git a/src/common/include/gudhi_patches/CGAL/Orthogonal_incremental_neighbor_search.h b/src/common/include/gudhi_patches/CGAL/Orthogonal_incremental_neighbor_search.h
index dbe707ed..e29ce14f 100644
--- a/src/common/include/gudhi_patches/CGAL/Orthogonal_incremental_neighbor_search.h
+++ b/src/common/include/gudhi_patches/CGAL/Orthogonal_incremental_neighbor_search.h
@@ -21,8 +21,7 @@
 #ifndef CGAL_ORTHOGONAL_INCREMENTAL_NEIGHBOR_SEARCH
 #define CGAL_ORTHOGONAL_INCREMENTAL_NEIGHBOR_SEARCH
 
-#include "CGAL/Kd_tree.h"
-
+#include <CGAL/Kd_tree.h>
 #include <cstring>
 #include <list>
 #include <queue>
-- 
cgit v1.2.3