From 931405155ef5b832012e65b44637df1edf8781d2 Mon Sep 17 00:00:00 2001
From: Duy-Nguyen Ta <thduynguyen@gmail.com>
Date: Fri, 28 Jul 2017 15:24:30 -0400
Subject: [PATCH] move GTSAM_CYTHON_INSTALL_PATH to main CMakeLists. Set
 eigency install path in gtsam_extra.cmake so other non-gtsam projects can
 find.

---
 CMakeLists.txt              | 11 ++++++++++-
 cmake/GtsamCythonWrap.cmake |  6 ------
 gtsam_extra.cmake.in        |  4 ++++
 3 files changed, 14 insertions(+), 7 deletions(-)

diff --git a/CMakeLists.txt b/CMakeLists.txt
index c462f5aa6..c502a6a7e 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -386,7 +386,16 @@ endif()
 
 # Cython wrap
 if (GTSAM_INSTALL_CYTHON_TOOLBOX)
-	add_subdirectory(cython)
+  set(GTSAM_INSTALL_CYTHON_TOOLBOX 1)
+  # Set up cache options
+  set(GTSAM_CYTHON_INSTALL_PATH "" CACHE PATH "Cython toolbox destination, blank defaults to CMAKE_INSTALL_PREFIX/cython")
+  if(NOT GTSAM_CYTHON_INSTALL_PATH)
+    set(GTSAM_CYTHON_INSTALL_PATH "${CMAKE_INSTALL_PREFIX}/cython")
+  endif()
+  set(GTSAM_EIGENCY_INSTALL_PATH ${GTSAM_CYTHON_INSTALL_PATH}/gtsam_eigency)
+  add_subdirectory(cython)
+else()
+  set(GTSAM_INSTALL_CYTHON_TOOLBOX 0) # This will go into config.h
 endif()
 
 
diff --git a/cmake/GtsamCythonWrap.cmake b/cmake/GtsamCythonWrap.cmake
index f49677d0e..50d2b16da 100644
--- a/cmake/GtsamCythonWrap.cmake
+++ b/cmake/GtsamCythonWrap.cmake
@@ -5,12 +5,6 @@ unset(PYTHON_EXECUTABLE CACHE)
 unset(CYTHON_EXECUTABLE CACHE)
 find_package(Cython 0.25.2 REQUIRED)
 
-# Set up cache options
-set(GTSAM_CYTHON_INSTALL_PATH "" CACHE PATH "Cython toolbox destination, blank defaults to CMAKE_INSTALL_PREFIX/cython")
-if(NOT GTSAM_CYTHON_INSTALL_PATH)
-  set(GTSAM_CYTHON_INSTALL_PATH "${CMAKE_INSTALL_PREFIX}/cython")
-endif()
-
 # User-friendly Cython wrapping and installing function.
 # Builds a Cython module from the provided interface_header.
 # For example, for the interface header gtsam.h,
diff --git a/gtsam_extra.cmake.in b/gtsam_extra.cmake.in
index 781b08d57..a1a8e3a90 100644
--- a/gtsam_extra.cmake.in
+++ b/gtsam_extra.cmake.in
@@ -20,3 +20,7 @@ list(APPEND GTSAM_INCLUDE_DIR "@GTSAM_EIGEN_INCLUDE_PREFIX@")
 if("@GTSAM_USE_EIGEN_MKL@")
   list(APPEND GTSAM_INCLUDE_DIR "@MKL_INCLUDE_DIR@")
 endif()
+
+if("@GTSAM_INSTALL_CYTHON_TOOLBOX@")
+  list(APPEND GTSAM_EIGENCY_INSTALL_PATH "@GTSAM_EIGENCY_INSTALL_PATH@")
+endif()