diff --git a/cmake/HandleGlobalBuildFlags.cmake b/cmake/HandleGlobalBuildFlags.cmake index af59b83177..e554199056 100644 --- a/cmake/HandleGlobalBuildFlags.cmake +++ b/cmake/HandleGlobalBuildFlags.cmake @@ -19,7 +19,7 @@ if(MSVC AND GTSAM_SHARED_LIB) endif() if (APPLE AND GTSAM_SHARED_LIB) - # Set the default install directory on macOS + # Setting to @rpath so that dependent executables can find the GTSAM dylib in a portable manner set(CMAKE_INSTALL_NAME_DIR "@rpath") endif() diff --git a/gtsam/constrained/NonlinearEqualityConstraint.cpp b/gtsam/constrained/NonlinearEqualityConstraint.cpp index effc8774c1..a29f06777c 100644 --- a/gtsam/constrained/NonlinearEqualityConstraint.cpp +++ b/gtsam/constrained/NonlinearEqualityConstraint.cpp @@ -60,7 +60,7 @@ Vector NonlinearEqualityConstraints::violationVector(const Values& values, bool size_t start_idx = 0; for (const auto& constraint : *this) { size_t dim = constraint->dim(); - violation.middleCols(start_idx, dim) = + violation.segment(start_idx, dim) = whiten ? constraint->whitenedError(values) : constraint->unwhitenedError(values); start_idx += dim; }