From 87443621c4eb177b0ea2b67a0a834106ba0f4e5a Mon Sep 17 00:00:00 2001
From: Duy-Nguyen Ta <thduynguyen@gmail.com>
Date: Mon, 20 Mar 2017 17:16:17 -0400
Subject: [PATCH] make gtsam_unstable_cython_wrapper dependent on
 gtsam_cython_wrapper.

---
 cython/gtsam_unstable/setup.py.in | 4 ++++
 gtsam_unstable/CMakeLists.txt     | 4 ++++
 2 files changed, 8 insertions(+)

diff --git a/cython/gtsam_unstable/setup.py.in b/cython/gtsam_unstable/setup.py.in
index 4b69ad346..2fdad076d 100644
--- a/cython/gtsam_unstable/setup.py.in
+++ b/cython/gtsam_unstable/setup.py.in
@@ -2,6 +2,10 @@ from distutils.core import setup
 from distutils.extension import Extension
 from Cython.Build import cythonize
 import eigency
+import sys
+
+# so that it can find the wrapped gtsam package
+sys.path.append("..")
 
 setup(
     ext_modules=cythonize(Extension(
diff --git a/gtsam_unstable/CMakeLists.txt b/gtsam_unstable/CMakeLists.txt
index 38d7c8725..a27c1314b 100644
--- a/gtsam_unstable/CMakeLists.txt
+++ b/gtsam_unstable/CMakeLists.txt
@@ -130,6 +130,10 @@ if (GTSAM_INSTALL_CYTHON_TOOLBOX)
                                     "../cython/gtsam_unstable"         # path to setup.py.in 
                                     "${GTSAM_CYTHON_INSTALL_PATH}/gtsam" # install path
                                     )
+    add_dependencies(gtsam_unstable_cython_wrapper gtsam_cython_wrapper)
+    # making the cython/gtsam folder a python package, so gtsam can be found while wrapping gtsam_unstable
+    add_custom_target(copy_gtsam_init COMMAND ${CMAKE_COMMAND} -E copy "${CMAKE_SOURCE_DIR}/cython/gtsam/__init__.py" "${CMAKE_BINARY_DIR}/cython/gtsam")
+    add_dependencies(gtsam_unstable_cython_wrapper copy_gtsam_init)
 endif ()
 
 # Build examples