From ce4968d4989f65b78127a682505d4302afdde419 Mon Sep 17 00:00:00 2001 From: Richard Roberts Date: Thu, 5 Jul 2012 14:04:55 +0000 Subject: [PATCH] Wrap cmake options to more easily link with additional libraries --- gtsam/CMakeLists.txt | 2 +- gtsam_unstable/CMakeLists.txt | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/gtsam/CMakeLists.txt b/gtsam/CMakeLists.txt index 5a8692c74..e168116e7 100644 --- a/gtsam/CMakeLists.txt +++ b/gtsam/CMakeLists.txt @@ -136,5 +136,5 @@ if (GTSAM_BUILD_WRAP) # Macro to handle details of setting up targets # FIXME: issue with dependency between wrap_gtsam and wrap_gtsam_build, only shows up on CMake 2.8.3 - wrap_library(gtsam "${mexFlags}" "../") + wrap_library(gtsam "${mexFlags}" "../" "") endif () diff --git a/gtsam_unstable/CMakeLists.txt b/gtsam_unstable/CMakeLists.txt index 8d9cd6542..9851852e3 100644 --- a/gtsam_unstable/CMakeLists.txt +++ b/gtsam_unstable/CMakeLists.txt @@ -95,6 +95,6 @@ if (GTSAM_BUILD_WRAP) 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) # Macro to handle details of setting up targets - wrap_library(gtsam_unstable "${mexFlags}" "./") + wrap_library(gtsam_unstable "${mexFlags}" "./" gtsam) endif(GTSAM_BUILD_WRAP)