From 591a43a3430aab3216eb101c9f82803d89b1678e Mon Sep 17 00:00:00 2001 From: Alex Cunningham Date: Thu, 15 Aug 2013 17:44:17 +0000 Subject: [PATCH] Added TBB linking flags to wrap build script --- 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 d7a6ba86e..703a186a4 100644 --- a/gtsam/CMakeLists.txt +++ b/gtsam/CMakeLists.txt @@ -170,5 +170,5 @@ if (GTSAM_INSTALL_MATLAB_TOOLBOX) # 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}" "../" "${TBB_LIBS}") endif () diff --git a/gtsam_unstable/CMakeLists.txt b/gtsam_unstable/CMakeLists.txt index 7d2cb18cd..ab2a669fc 100644 --- a/gtsam_unstable/CMakeLists.txt +++ b/gtsam_unstable/CMakeLists.txt @@ -124,7 +124,7 @@ if (GTSAM_INSTALL_MATLAB_TOOLBOX) endif() # Macro to handle details of setting up targets - wrap_library(gtsam_unstable "${mexFlags}" "./" gtsam) + wrap_library(gtsam_unstable "${mexFlags}" "./" "gtsam;${TBB_LIBS}") endif(GTSAM_INSTALL_MATLAB_TOOLBOX)