Merge pull request #27 from AaltoML/move-yaml-outside-slam-flag

Always yaml-cpp regardless of USE_SLAM flag
AaltoML · Apr 6, 2021 · 0316924 · 0316924
2 parents a1418f2 + 905ed23
commit 0316924
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 2 deletions.
diff --git a/scripts/build.sh b/scripts/build.sh
@@ -74,8 +74,9 @@ if [[ $TARGET_ARCHITECTURE == "host" ]]; then
   source $SCRIPT_DIR/loguru/build.sh
 fi
 
+source $SCRIPT_DIR/yaml-cpp.sh
+
 if [[ $USE_SLAM == "ON" ]]; then
-  source $SCRIPT_DIR/yaml-cpp.sh
   if [[ -z $IOS_CROSS_COMPILING_HACKS && $OPENBLAS == "ON" ]]; then
     # iOS uses Accelerate framework instead.
     source $SCRIPT_DIR/openblas.sh

diff --git a/scripts/mobile-cv-suite-config.cmake b/scripts/mobile-cv-suite-config.cmake
@@ -23,6 +23,7 @@ set(_MCS_CORE_INTERFACE_LIBS
   # --- static
   ${_MCS_LIBS}/libtheia.a
   ${_MCS_LIBS}/libaccelerated-arrays.a
+  ${_MCS_LIBS}/libyaml-cpp.a
 )
 
 # --- opencv
@@ -84,7 +85,6 @@ if (_MCS_USE_SLAM)
     ${_MCS_LIBS}/libg2o_types_slam2d_addons.a
     ${_MCS_LIBS}/libg2o_types_slam3d.a
     ${_MCS_LIBS}/libg2o_types_slam3d_addons.a
-    ${_MCS_LIBS}/libyaml-cpp.a
     # --- shared
     # libbtf and cxsparse are LGPL licensed, so they must be used as shared libraries
     ${_MCS_LIBS}/libbtf${CMAKE_SHARED_LIBRARY_SUFFIX}