Hopefully fixed the mex build flags
parent
c3e3b693e7
commit
4d31dd99f3
|
@ -157,8 +157,7 @@ if (GTSAM_INSTALL_MATLAB_TOOLBOX)
|
|||
set(GTSAM_LIB_DIR ${MEX_LIB_ROOT}/gtsam) # FIXME: is this used?
|
||||
|
||||
# Generate, build and install toolbox
|
||||
#set(mexFlags "${GTSAM_BUILD_MEX_BINARY_FLAGS} -I${MEX_INCLUDE_ROOT} -I${TBB_INCLUDE_DIRS} -I${Boost_INCLUDE_DIR} -I${CMAKE_BINARY_DIR}")
|
||||
message("Additional mexFlags: [${mexFlags}]")
|
||||
set(mexFlags "${GTSAM_BUILD_MEX_BINARY_FLAGS}")
|
||||
if("${gtsam-default}" STREQUAL "gtsam-static")
|
||||
list(APPEND mexFlags -DGTSAM_IMPORT_STATIC)
|
||||
endif()
|
||||
|
|
|
@ -108,7 +108,7 @@ if (GTSAM_INSTALL_MATLAB_TOOLBOX)
|
|||
set(GTSAM_UNSTABLE_LIB_DIR ${MEX_LIB_ROOT}/gtsam_unstable) # FIXME: is this used?
|
||||
|
||||
# Generate, build and install toolbox
|
||||
set(mexFlags "-I${MEX_INCLUDE_ROOT} -I${TBB_INCLUDE_DIRS} -I${Boost_INCLUDE_DIR} -I${CMAKE_BINARY_DIR}")
|
||||
set(mexFlags "${GTSAM_BUILD_MEX_BINARY_FLAGS}")
|
||||
if("${gtsam-default}" STREQUAL "gtsam-static")
|
||||
list(APPEND mexFlags -DGTSAM_IMPORT_STATIC)
|
||||
endif()
|
||||
|
|
Loading…
Reference in New Issue