From e624b6fe7242b24f2e201b82a932fd4fce7aed12 Mon Sep 17 00:00:00 2001
From: Duy-Nguyen Ta <thduynguyen@gmail.com>
Date: Sat, 18 Mar 2017 22:01:24 -0400
Subject: [PATCH] don't change matlab's generated filename (gtsam_wrapper),
 only cmake targets (to gtsam_matlab_wrapper)

---
 cmake/GtsamMatlabWrap.cmake | 4 ++--
 wrap/Module.cpp             | 2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/cmake/GtsamMatlabWrap.cmake b/cmake/GtsamMatlabWrap.cmake
index 594b7e8bf..bdd868665 100644
--- a/cmake/GtsamMatlabWrap.cmake
+++ b/cmake/GtsamMatlabWrap.cmake
@@ -93,7 +93,7 @@ function(wrap_library_internal interfaceHeader linkLibraries extraIncludeDirs ex
 	
 	# Paths for generated files
 	set(generated_files_path "${PROJECT_BINARY_DIR}/wrap/${moduleName}")
-	set(generated_cpp_file "${generated_files_path}/${moduleName}_matlab_wrapper.cpp")
+	set(generated_cpp_file "${generated_files_path}/${moduleName}_wrapper.cpp")
 	set(compiled_mex_modules_root "${PROJECT_BINARY_DIR}/wrap/${moduleName}_mex")
 	
 	message(STATUS "Building wrap module ${moduleName}")
@@ -222,7 +222,7 @@ function(wrap_library_internal interfaceHeader linkLibraries extraIncludeDirs ex
 	add_library(${moduleName}_matlab_wrapper MODULE ${generated_cpp_file} ${interfaceHeader} ${otherSourcesAndObjects})
 	target_link_libraries(${moduleName}_matlab_wrapper ${correctedOtherLibraries})
 	set_target_properties(${moduleName}_matlab_wrapper PROPERTIES
-		OUTPUT_NAME              "${moduleName}_matlab_wrapper"
+		OUTPUT_NAME              "${moduleName}_wrapper"
 		PREFIX                   ""
 		SUFFIX                   ".${mexModuleExt}"
 		LIBRARY_OUTPUT_DIRECTORY "${compiled_mex_modules_root}"
diff --git a/wrap/Module.cpp b/wrap/Module.cpp
index af760493f..a6d9a72f6 100644
--- a/wrap/Module.cpp
+++ b/wrap/Module.cpp
@@ -264,7 +264,7 @@ void Module::generate_matlab_wrapper(const string& toolboxPath) const {
   fs::create_directories(toolboxPath);
 
   // create the unified .cpp switch file
-  const string wrapperName = name + "_matlab_wrapper";
+  const string wrapperName = name + "_wrapper";
   string wrapperFileName = toolboxPath + "/" + wrapperName + ".cpp";
   FileWriter wrapperFile(wrapperFileName, verbose, "//");
   wrapperFile.oss << "#include <wrap/matlab.h>\n";