From 243522c64b8dfdd1d53d6c9294256715d85c96c4 Mon Sep 17 00:00:00 2001 From: Richard Roberts Date: Mon, 17 Feb 2014 00:44:13 -0500 Subject: [PATCH] Fixed not linking to requested libraries in matlab wrapper --- cmake/GtsamMatlabWrap.cmake | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/cmake/GtsamMatlabWrap.cmake b/cmake/GtsamMatlabWrap.cmake index d699795fd..4f2434888 100644 --- a/cmake/GtsamMatlabWrap.cmake +++ b/cmake/GtsamMatlabWrap.cmake @@ -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(...) # extraMexFlags : Any additional compiler flags 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}") endfunction() @@ -103,7 +103,7 @@ function(wrap_library_internal interfaceHeader linkLibraries extraIncludeDirs ex # Add -shared or -static suffix to targets set(correctedOtherLibraries "") set(otherLibraryTargets "") - foreach(lib ${moduleName} ${otherLibraries}) + foreach(lib ${moduleName} ${linkLibraries}) if(TARGET ${lib}) list(APPEND correctedOtherLibraries ${lib}) list(APPEND otherLibraryTargets ${lib})