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

Fixed not linking to requested libraries in matlab wrapper

release/4.3a0
Richard Roberts 2014-02-17 00:44:13 -05:00
parent 3293df1529
commit 243522c64b
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
cmake/GtsamMatlabWrap.cmake
View File

@ -48,7 +48,7 @@ set(MATLAB_ROOT "${MATLAB_ROOT}" CACHE PATH "Path to MATLAB installation root (e
# extraIncludeDirs : Extra include directories, in addition to those already passed to include_directories(...) # extraIncludeDirs : Extra include directories, in addition to those already passed to include_directories(...)
# extraMexFlags : Any additional compiler flags # extraMexFlags : Any additional compiler flags
function(wrap_and_install_library interfaceHeader linkLibraries extraIncludeDirs extraMexFlags) function(wrap_and_install_library interfaceHeader linkLibraries extraIncludeDirs extraMexFlags)
wrap_library_internal("${interfaceHeader}" "${otherLibraries}" "${extraIncludeDirs}" "${mexFlags}") wrap_library_internal("${interfaceHeader}" "${linkLibraries}" "${extraIncludeDirs}" "${mexFlags}")
install_wrapped_library_internal("${interfaceHeader}") install_wrapped_library_internal("${interfaceHeader}")
endfunction() endfunction()
@ -103,7 +103,7 @@ function(wrap_library_internal interfaceHeader linkLibraries extraIncludeDirs ex
# Add -shared or -static suffix to targets # Add -shared or -static suffix to targets
set(correctedOtherLibraries "") set(correctedOtherLibraries "")
set(otherLibraryTargets "") set(otherLibraryTargets "")
foreach(lib ${moduleName} ${otherLibraries}) foreach(lib ${moduleName} ${linkLibraries})
if(TARGET ${lib}) if(TARGET ${lib})
list(APPEND correctedOtherLibraries ${lib}) list(APPEND correctedOtherLibraries ${lib})
list(APPEND otherLibraryTargets ${lib}) list(APPEND otherLibraryTargets ${lib})