From 6723b481a6e2985ed6204e4520b5bc57c2dd6727 Mon Sep 17 00:00:00 2001
From: jlblancoc <joseluisblancoc@gmail.com>
Date: Sun, 17 Feb 2019 00:58:35 +0100
Subject: [PATCH] fix missing Eigen in Cython wrapper

---
 CMakeLists.txt                      |  8 ++++++--
 cython/gtsam_eigency/CMakeLists.txt | 11 +++++++++++
 cython/gtsam_eigency/__init__.py.in |  2 +-
 gtsam/CMakeLists.txt                | 12 ++----------
 4 files changed, 20 insertions(+), 13 deletions(-)

diff --git a/CMakeLists.txt b/CMakeLists.txt
index d084840be..c1a421a31 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -252,7 +252,7 @@ if(GTSAM_USE_SYSTEM_EIGEN)
 	find_package(Eigen3 REQUIRED)
 
 	# Use generic Eigen include paths e.g. <Eigen/Core>
-	set(GTSAM_EIGEN_INCLUDE_PREFIX "${EIGEN3_INCLUDE_DIR}")
+	set(GTSAM_EIGEN_INCLUDE_FOR_INSTALL "${EIGEN3_INCLUDE_DIR}")
 
 	# check if MKL is also enabled - can have one or the other, but not both!
 	# Note: Eigen >= v3.2.5 includes our patches
@@ -266,6 +266,8 @@ if(GTSAM_USE_SYSTEM_EIGEN)
 		message(FATAL_ERROR "MKL does not work with Eigen 3.3.4 because of a bug in Eigen. See http://eigen.tuxfamily.org/bz/show_bug.cgi?id=1527. Disable GTSAM_USE_SYSTEM_EIGEN to use GTSAM's copy of Eigen, disable GTSAM_WITH_EIGEN_MKL, or upgrade/patch your installation of Eigen.")
 	endif()
 
+	# The actual include directory (for BUILD cmake target interface):
+	set(GTSAM_EIGEN_INCLUDE_FOR_BUILD "${EIGEN3_INCLUDE_DIR}")
 else()
 	# Use bundled Eigen include path.
 	# Clear any variables set by FindEigen3
@@ -275,8 +277,10 @@ else()
 
 	# set full path to be used by external projects
 	# this will be added to GTSAM_INCLUDE_DIR by gtsam_extra.cmake.in
-	set(GTSAM_EIGEN_INCLUDE_PREFIX "include/gtsam/3rdparty/Eigen/")
+	set(GTSAM_EIGEN_INCLUDE_FOR_INSTALL "include/gtsam/3rdparty/Eigen/")
 
+	# The actual include directory (for BUILD cmake target interface):
+	set(GTSAM_EIGEN_INCLUDE_FOR_BUILD "${CMAKE_SOURCE_DIR}/gtsam/3rdparty/Eigen/")
 endif()
 
 if (MSVC)
diff --git a/cython/gtsam_eigency/CMakeLists.txt b/cython/gtsam_eigency/CMakeLists.txt
index 54b7de9aa..4bff567eb 100644
--- a/cython/gtsam_eigency/CMakeLists.txt
+++ b/cython/gtsam_eigency/CMakeLists.txt
@@ -22,6 +22,17 @@ cythonize(cythonize_eigency_conversions "../gtsam_eigency/conversions.pyx" "conv
   "${OUTPUT_DIR}" "${EIGENCY_INCLUDE_DIR}" "" "" "")
 cythonize(cythonize_eigency_core "../gtsam_eigency/core.pyx" "core"
   ${OUTPUT_DIR} "${EIGENCY_INCLUDE_DIR}" "" "" "")
+
+# Include Eigen headers:
+target_include_directories(cythonize_eigency_conversions PUBLIC
+  $<BUILD_INTERFACE:${GTSAM_EIGEN_INCLUDE_FOR_BUILD}>
+  $<INSTALL_INTERFACE:${GTSAM_EIGEN_INCLUDE_FOR_INSTALL}>
+)
+target_include_directories(cythonize_eigency_core PUBLIC
+  $<BUILD_INTERFACE:${GTSAM_EIGEN_INCLUDE_FOR_BUILD}>
+  $<INSTALL_INTERFACE:${GTSAM_EIGEN_INCLUDE_FOR_INSTALL}>
+)
+
 add_dependencies(cythonize_eigency_core cythonize_eigency_conversions)
 add_custom_target(cythonize_eigency)
 add_dependencies(cythonize_eigency cythonize_eigency_conversions cythonize_eigency_core)
diff --git a/cython/gtsam_eigency/__init__.py.in b/cython/gtsam_eigency/__init__.py.in
index dd278d128..a59d51eab 100644
--- a/cython/gtsam_eigency/__init__.py.in
+++ b/cython/gtsam_eigency/__init__.py.in
@@ -1,7 +1,7 @@
 import os
 import numpy as np
 
-__eigen_dir__ = "${GTSAM_EIGEN_INCLUDE_PREFIX}"
+__eigen_dir__ = "${GTSAM_EIGEN_INCLUDE_FOR_INSTALL}"
 
 def get_includes(include_eigen=True):
     root = os.path.dirname(__file__)
diff --git a/gtsam/CMakeLists.txt b/gtsam/CMakeLists.txt
index 034268fdb..b4adc9978 100644
--- a/gtsam/CMakeLists.txt
+++ b/gtsam/CMakeLists.txt
@@ -117,17 +117,9 @@ set_target_properties(gtsam PROPERTIES
 
 # Append Eigen include path, set in top-level CMakeLists.txt to either
 # system-eigen, or GTSAM eigen path
-if (GTSAM_USE_SYSTEM_EIGEN)
-  target_include_directories(gtsam PUBLIC
-    $<BUILD_INTERFACE:${EIGEN3_INCLUDE_DIR}>
-  )
-else()
-  target_include_directories(gtsam PUBLIC
-    $<BUILD_INTERFACE:${CMAKE_CURRENT_SOURCE_DIR}/3rdparty/Eigen/>
-  )
-endif()
 target_include_directories(gtsam PUBLIC
-  $<INSTALL_INTERFACE:${GTSAM_EIGEN_INCLUDE_PREFIX}>
+  $<BUILD_INTERFACE:${GTSAM_EIGEN_INCLUDE_FOR_BUILD}>
+  $<INSTALL_INTERFACE:${GTSAM_EIGEN_INCLUDE_FOR_INSTALL}>
 )
 # MKL include dir:
 if (GTSAM_USE_EIGEN_MKL)