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

Partial fix to MSVC Matlab builds

release/4.3a0
Jose Luis Blanco-Claraco 2019-07-12 07:58:18 +02:00
parent 6dec8b1268
commit 1ca0e3395c
2 changed files with 2 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
cmake/GtsamMatlabWrap.cmake
View File

@ -226,6 +226,7 @@ function(wrap_library_internal interfaceHeader linkLibraries extraIncludeDirs ex
string(REPLACE ";" " " mexFlagsSpaced "${GTSAM_BUILD_MEX_BINARY_FLAGS}") string(REPLACE ";" " " mexFlagsSpaced "${GTSAM_BUILD_MEX_BINARY_FLAGS}")
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})
target_link_libraries(${moduleName}_matlab_wrapper ${moduleName})
set_target_properties(${moduleName}_matlab_wrapper PROPERTIES set_target_properties(${moduleName}_matlab_wrapper PROPERTIES
OUTPUT_NAME "${moduleName}_wrapper" OUTPUT_NAME "${moduleName}_wrapper"
PREFIX "" PREFIX ""

2
gtsam/navigation/ScenarioRunner.h
View File

@ -36,7 +36,7 @@ static noiseModel::Diagonal::shared_ptr Diagonal(const Matrix& covariance) {
* Simple class to test navigation scenarios. * Simple class to test navigation scenarios.
* Takes a trajectory scenario as input, and can generate IMU measurements * Takes a trajectory scenario as input, and can generate IMU measurements
*/ */
class ScenarioRunner { class GTSAM_EXPORT ScenarioRunner {
public: public:
typedef imuBias::ConstantBias Bias; typedef imuBias::ConstantBias Bias;
typedef boost::shared_ptr<PreintegrationParams> SharedParams; typedef boost::shared_ptr<PreintegrationParams> SharedParams;