From 8037c44b173189d32f7b500e24c20ecfa52af59c Mon Sep 17 00:00:00 2001
From: Duy-Nguyen Ta <thduynguyen@gmail.com>
Date: Wed, 6 Jun 2012 09:35:19 +0000
Subject: [PATCH] fix CMakeLists to generate correct paths to gtsam lib for
 MEX, both in command line and make_gtsam.m

---
 gtsam/CMakeLists.txt          | 4 +++-
 gtsam_unstable/CMakeLists.txt | 6 +++++-
 2 files changed, 8 insertions(+), 2 deletions(-)

diff --git a/gtsam/CMakeLists.txt b/gtsam/CMakeLists.txt
index ec0d7847d..5ab49b632 100644
--- a/gtsam/CMakeLists.txt
+++ b/gtsam/CMakeLists.txt
@@ -124,13 +124,15 @@ if (GTSAM_BUILD_WRAP)
     if (GTSAM_BUILD_MEX_BIN)
         set(MEX_INCLUDE_ROOT ${GTSAM_SOURCE_ROOT_DIR})
         set(MEX_LIB_ROOT ${CMAKE_BINARY_DIR})
+        set(GTSAM_LIB_DIR ${MEX_LIB_ROOT}/gtsam)
     else()
         set(MEX_INCLUDE_ROOT ${CMAKE_INSTALL_PREFIX}/include)
         set(MEX_LIB_ROOT ${CMAKE_INSTALL_PREFIX}/lib)
+        set(GTSAM_LIB_DIR ${MEX_LIB_ROOT})
     endif()
     
     # Generate, build and install toolbox
-    set(mexFlags "-I${Boost_INCLUDE_DIR} -I${MEX_INCLUDE_ROOT} -I${MEX_INCLUDE_ROOT}/gtsam -I${MEX_INCLUDE_ROOT}/gtsam/base -I${MEX_INCLUDE_ROOT}/gtsam/geometry -I${MEX_INCLUDE_ROOT}/gtsam/linear -I${MEX_INCLUDE_ROOT}/gtsam/discrete -I${MEX_INCLUDE_ROOT}/gtsam/inference -I${MEX_INCLUDE_ROOT}/gtsam/nonlinear -I${MEX_INCLUDE_ROOT}/gtsam/slam -L${MEX_LIB_ROOT} -lgtsam")
+    set(mexFlags "-I${Boost_INCLUDE_DIR} -I${MEX_INCLUDE_ROOT} -I${MEX_INCLUDE_ROOT}/gtsam -I${MEX_INCLUDE_ROOT}/gtsam/base -I${MEX_INCLUDE_ROOT}/gtsam/geometry -I${MEX_INCLUDE_ROOT}/gtsam/linear -I${MEX_INCLUDE_ROOT}/gtsam/discrete -I${MEX_INCLUDE_ROOT}/gtsam/inference -I${MEX_INCLUDE_ROOT}/gtsam/nonlinear -I${MEX_INCLUDE_ROOT}/gtsam/slam -L${GTSAM_LIB_DIR} -lgtsam")
     
     # Macro to handle details of setting up targets
     wrap_library(gtsam "${mexFlags}" "../")
diff --git a/gtsam_unstable/CMakeLists.txt b/gtsam_unstable/CMakeLists.txt
index 8c3b220c6..7637f6ea8 100644
--- a/gtsam_unstable/CMakeLists.txt
+++ b/gtsam_unstable/CMakeLists.txt
@@ -75,13 +75,17 @@ if (GTSAM_BUILD_WRAP)
     if (GTSAM_BUILD_MEX_BIN)
         set(MEX_INCLUDE_ROOT ${GTSAM_SOURCE_ROOT_DIR})
         set(MEX_LIB_ROOT ${CMAKE_BINARY_DIR})
+        set(GTSAM_LIB_DIR ${MEX_LIB_ROOT}/gtsam)
+        set(GTSAM_UNSTABLE_LIB_DIR ${MEX_LIB_ROOT}/gtsam_unstable)
     else()
         set(MEX_INCLUDE_ROOT ${CMAKE_INSTALL_PREFIX}/include)
         set(MEX_LIB_ROOT ${CMAKE_INSTALL_PREFIX}/lib)
+        set(GTSAM_LIB_DIR ${MEX_LIB_ROOT})
+        set(GTSAM_UNSTABLE_LIB_DIR ${MEX_LIB_ROOT})
     endif()
     
     # Generate, build and install toolbox
-    set(mexFlags "-I${Boost_INCLUDE_DIR} -I${MEX_INCLUDE_ROOT} -I${MEX_INCLUDE_ROOT}/gtsam_unstable -I${MEX_INCLUDE_ROOT}/gtsam_unstable/dynamics -I${MEX_INCLUDE_ROOT}/gtsam_unstable/discrete -L${MEX_LIB_ROOT}/gtsam_unstable -L${MEX_LIB_ROOT}/gtsam -lgtsam -lgtsam_unstable")
+    set(mexFlags "-I${Boost_INCLUDE_DIR} -I${MEX_INCLUDE_ROOT} -I${MEX_INCLUDE_ROOT}/gtsam_unstable -I${MEX_INCLUDE_ROOT}/gtsam_unstable/dynamics -I${MEX_INCLUDE_ROOT}/gtsam_unstable/discrete -L${GTSAM_UNSTABLE_LIB_DIR} -L${GTSAM_LIB_DIR} -lgtsam -lgtsam_unstable")
     
     # Macro to handle details of setting up targets
     wrap_library(gtsam_unstable "${mexFlags}" "./")