Added missing dependency

release/4.3a0
Alex Cunningham 2012-01-31 19:59:17 +00:00
parent 2f44444efe
commit c3f8c791b2
1 changed files with 4 additions and 6 deletions

View File

@ -93,7 +93,8 @@ message(STATUS "Current Matlab mex extension: ${mex_bin_extension}")
# Actual build commands - separated by OS # Actual build commands - separated by OS
add_custom_target(wrap_gtsam ALL COMMAND add_custom_target(wrap_gtsam ALL COMMAND
./wrap ${mex_bin_extension} ${CMAKE_SOURCE_DIR} ${moduleName} ${toolbox_path} "${mexFlags}") ./wrap ${mex_bin_extension} ${CMAKE_SOURCE_DIR} ${moduleName} ${toolbox_path} "${mexFlags}"
DEPENDS wrap)
option(GTSAM_INSTALL_MATLAB_TOOLBOX "Enable/Disable installation of matlab toolbox" ON) option(GTSAM_INSTALL_MATLAB_TOOLBOX "Enable/Disable installation of matlab toolbox" ON)
option(GTSAM_INSTALL_MATLAB_EXAMPLES "Enable/Disable installation of matlab examples" ON) option(GTSAM_INSTALL_MATLAB_EXAMPLES "Enable/Disable installation of matlab examples" ON)
@ -104,13 +105,10 @@ set(toolbox_install_path ${CMAKE_INSTALL_PREFIX}/borg/toolbox CACHE DOCSTRING "P
if (GTSAM_INSTALL_MATLAB_TOOLBOX) if (GTSAM_INSTALL_MATLAB_TOOLBOX)
# Primary toolbox files # Primary toolbox files
message(STATUS "Installing Matlab Toolbox to ${toolbox_install_path}") message(STATUS "Installing Matlab Toolbox to ${toolbox_install_path}")
install(DIRECTORY DESTINATION ${toolbox_install_path}) install(DIRECTORY DESTINATION ${toolbox_install_path}) # make an empty folder
# exploit need for trailing slash to specify a full folder, rather than just its contents to copy
install(DIRECTORY ${toolbox_path} DESTINATION ${toolbox_install_path}) install(DIRECTORY ${toolbox_path} DESTINATION ${toolbox_install_path})
#install(DIRECTORY ${toolbox_path} DESTINATION ${toolbox_install_path} FILES_MATCHING PATTERN "*.m")
#install(DIRECTORY ${toolbox_path} DESTINATION ${toolbox_install_path} FILES_MATCHING PATTERN "*.cpp")
#install(DIRECTORY ${toolbox_path} DESTINATION ${toolbox_install_path} FILES_MATCHING PATTERN "Makefile")
# Examples # Examples
if (GTSAM_INSTALL_MATLAB_EXAMPLES) if (GTSAM_INSTALL_MATLAB_EXAMPLES)
message(STATUS "Installing Matlab Toolbox Examples") message(STATUS "Installing Matlab Toolbox Examples")