Merge branch 'develop' into feature/python-install

2020-06-23 23:55:09 -04:00 · 2020-06-23 23:55:09 -04:00 · 56539c9e1a
parent ca46ebfda8 f7dfff0f95
commit 56539c9e1a
3 changed files with 4 additions and 2 deletions
--- a/.travis.yml
+++ b/.travis.yml
@ -14,7 +14,8 @@ addons:
    - clang-9
    - build-essential pkg-config
    - cmake
-    - libpython-dev python-numpy
+    - python3-dev libpython-dev
+    - python3-numpy
    - libboost-all-dev

 # before_install:
--- a/cython/requirements.txt
+++ b/cython/requirements.txt
@ -1,3 +1,3 @@
 Cython>=0.25.2
 backports_abc>=0.5
-numpy>=1.12.0
+numpy>=1.11.0
--- a/gtsam_extra.cmake.in
+++ b/gtsam_extra.cmake.in
@ -9,5 +9,6 @@ set (GTSAM_USE_TBB @GTSAM_USE_TBB@)
 set (GTSAM_DEFAULT_ALLOCATOR @GTSAM_DEFAULT_ALLOCATOR@)

 if("@GTSAM_INSTALL_CYTHON_TOOLBOX@")
+  list(APPEND GTSAM_CYTHON_INSTALL_PATH "@GTSAM_CYTHON_INSTALL_PATH@")
  list(APPEND GTSAM_EIGENCY_INSTALL_PATH "@GTSAM_EIGENCY_INSTALL_PATH@")
 endif()