From e78f73cfe98b2f91aa770c04a967a5253f23ea35 Mon Sep 17 00:00:00 2001 From: ivan Date: Mon, 7 Mar 2016 10:12:42 -0500 Subject: [PATCH] Merge branches 'develop' and 'feature/LPSolver' of bitbucket.org:gtborg/gtsam into feature/LPSolver Added System Flag temporarily to remove warnings. # Conflicts: # CMakeLists.txt --- CMakeLists.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index 8c4229ed5..16fa5d4c5 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -242,7 +242,7 @@ else() endif() # Add the bundled version of eigen to the include path so that it can still be included # with #include - include_directories(BEFORE "gtsam/3rdparty/Eigen/") + include_directories(BEFORE SYSTEM "gtsam/3rdparty/Eigen/") # set full path to be used by external projects # this will be added to GTSAM_INCLUDE_DIR by gtsam_extra.cmake.in