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

don't change matlab's generated filename (gtsam_wrapper), only cmake targets (to gtsam_matlab_wrapper)

release/4.3a0
Duy-Nguyen Ta 2017-03-18 22:01:24 -04:00
parent e1fedad0a6
commit e624b6fe72
2 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
cmake/GtsamMatlabWrap.cmake
View File

@ -93,7 +93,7 @@ function(wrap_library_internal interfaceHeader linkLibraries extraIncludeDirs ex
# Paths for generated files # Paths for generated files
set(generated_files_path "${PROJECT_BINARY_DIR}/wrap/${moduleName}") 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") set(compiled_mex_modules_root "${PROJECT_BINARY_DIR}/wrap/${moduleName}_mex")
message(STATUS "Building wrap module ${moduleName}") 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}) add_library(${moduleName}_matlab_wrapper MODULE ${generated_cpp_file} ${interfaceHeader} ${otherSourcesAndObjects})
target_link_libraries(${moduleName}_matlab_wrapper ${correctedOtherLibraries}) target_link_libraries(${moduleName}_matlab_wrapper ${correctedOtherLibraries})
set_target_properties(${moduleName}_matlab_wrapper PROPERTIES set_target_properties(${moduleName}_matlab_wrapper PROPERTIES
OUTPUT_NAME "${moduleName}_matlab_wrapper" OUTPUT_NAME "${moduleName}_wrapper"
PREFIX "" PREFIX ""
SUFFIX ".${mexModuleExt}" SUFFIX ".${mexModuleExt}"
LIBRARY_OUTPUT_DIRECTORY "${compiled_mex_modules_root}" LIBRARY_OUTPUT_DIRECTORY "${compiled_mex_modules_root}"

2
wrap/Module.cpp
View File

@ -264,7 +264,7 @@ void Module::generate_matlab_wrapper(const string& toolboxPath) const {
fs::create_directories(toolboxPath); fs::create_directories(toolboxPath);
// create the unified .cpp switch file // create the unified .cpp switch file
const string wrapperName = name + "_matlab_wrapper"; const string wrapperName = name + "_wrapper";
string wrapperFileName = toolboxPath + "/" + wrapperName + ".cpp"; string wrapperFileName = toolboxPath + "/" + wrapperName + ".cpp";
FileWriter wrapperFile(wrapperFileName, verbose, "//"); FileWriter wrapperFile(wrapperFileName, verbose, "//");
wrapperFile.oss << "#include <wrap/matlab.h>\n"; wrapperFile.oss << "#include <wrap/matlab.h>\n";