12345qiupeng
/
gtsam
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Added TBB include directories when compiling matlab wrapper

release/4.3a0
Richard Roberts 2013-08-22 21:44:14 +00:00
parent 14bcab725f
commit 930c537991
2 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
gtsam/CMakeLists.txt
View File

@ -157,7 +157,7 @@ if (GTSAM_INSTALL_MATLAB_TOOLBOX)
set(GTSAM_LIB_DIR ${MEX_LIB_ROOT}/gtsam) # FIXME: is this used? set(GTSAM_LIB_DIR ${MEX_LIB_ROOT}/gtsam) # FIXME: is this used?
# Generate, build and install toolbox # Generate, build and install toolbox
set(mexFlags ${GTSAM_BUILD_MEX_BINARY_FLAGS} -I${MEX_INCLUDE_ROOT} -I${Boost_INCLUDE_DIR} -I${CMAKE_BINARY_DIR}) set(mexFlags ${GTSAM_BUILD_MEX_BINARY_FLAGS} -I${MEX_INCLUDE_ROOT} -I${TBB_INCLUDE_DIRS} -I${Boost_INCLUDE_DIR} -I${CMAKE_BINARY_DIR})
if("${gtsam-default}" STREQUAL "gtsam-static") if("${gtsam-default}" STREQUAL "gtsam-static")
list(APPEND mexFlags -DGTSAM_IMPORT_STATIC) list(APPEND mexFlags -DGTSAM_IMPORT_STATIC)
endif() endif()

2
gtsam_unstable/CMakeLists.txt
View File

@ -108,7 +108,7 @@ if (GTSAM_INSTALL_MATLAB_TOOLBOX)
set(GTSAM_UNSTABLE_LIB_DIR ${MEX_LIB_ROOT}/gtsam_unstable) # FIXME: is this used? set(GTSAM_UNSTABLE_LIB_DIR ${MEX_LIB_ROOT}/gtsam_unstable) # FIXME: is this used?
# Generate, build and install toolbox # Generate, build and install toolbox
set(mexFlags -I${MEX_INCLUDE_ROOT} -I${Boost_INCLUDE_DIR} -I${CMAKE_BINARY_DIR}) set(mexFlags -I${MEX_INCLUDE_ROOT} -I${TBB_INCLUDE_DIRS} -I${Boost_INCLUDE_DIR} -I${CMAKE_BINARY_DIR})
if("${gtsam-default}" STREQUAL "gtsam-static") if("${gtsam-default}" STREQUAL "gtsam-static")
list(APPEND mexFlags -DGTSAM_IMPORT_STATIC) list(APPEND mexFlags -DGTSAM_IMPORT_STATIC)
endif() endif()