diff --git a/wrap/CMakeLists.txt b/wrap/CMakeLists.txt
index f7c279229..4772be2bb 100644
--- a/wrap/CMakeLists.txt
+++ b/wrap/CMakeLists.txt
@@ -93,7 +93,8 @@ message(STATUS "Current Matlab mex extension: ${mex_bin_extension}")
 
 # Actual build commands - separated by OS
 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_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)
     # Primary toolbox files
     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} 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
     if (GTSAM_INSTALL_MATLAB_EXAMPLES)
         message(STATUS "Installing Matlab Toolbox Examples")