merge cmake+core+sophus2 - wip

CMakeLists.txt

@@ -2,6 +2,20 @@ cmake_minimum_required(VERSION 3.16)
 # https://semver.org/
 project(farm_ng_core VERSION 0.2.0)
 
+list(APPEND CMAKE_MODULE_PATH
+    ${CMAKE_CURRENT_LIST_DIR}/cmake/cmake
+    $ENV{PREFIX_PATH}/share/cmake)
+
+include(farm_ng_macos_ssl_fix)
+include(ExternalProject)
+include(farm_ng_module)
+include(farm_ng_add_test)
+include(farm_ng_add_library)
+if(NOT FARM_NG_SUPER_PROJECT_BUILD_PROTOBUF)
+  include(farm_ng_add_protobufs)
+endif()
+include(farm_ng_default_args)
+
 
 farm_ng_module()
 farm_ng_enable_testing()

cmake/scripts/download_release.sh

@@ -5,7 +5,7 @@ DIR="$( cd "$( dirname "${BASH_SOURCE[0]}" )" >/dev/null 2>&1 && pwd )"
 cd $DIR
 
 # Choose release SHA based on git repo SHA
-RELEASE_SHA= b6feaaf2ab71bf8b695d0e405d39a8a6dde2f883
+RELEASE_SHA=f9f3bb6
 
 # Guess platform based on current platform
 if [[ -z "${RELEASE_PLATFORM}" ]]; then
@@ -27,5 +27,5 @@ else
 fi
 
 # Download Release
-VENV_TAR_URL=https://github.com/farm-ng/cmake/releases/download/v.$RELEASE_SHA/venv-$RELEASE_PLATFORM.tar.gz
+VENV_TAR_URL=https://github.com/farm-ng/farm-ng-core/releases/download/v.$RELEASE_SHA/venv-$RELEASE_PLATFORM.tar.gz
 curl -L $VENV_TAR_URL > venv.tar.gz

cpp/sophus2/CMakeLists.txt

@@ -3,8 +3,19 @@ project(Sophus VERSION 2.0.0)
 
 include(CMakePackageConfigHelpers)
 include(GNUInstallDirs)
+list(APPEND CMAKE_MODULE_PATH
+    ${CMAKE_CURRENT_LIST_DIR})
+
+include(farm_ng_macos_ssl_fix)
+include(ExternalProject)
+include(farm_ng_module)
+include(farm_ng_add_test)
+include(farm_ng_add_library)
+if(NOT FARM_NG_SUPER_PROJECT_BUILD_PROTOBUF)
+  include(farm_ng_add_protobufs)
+endif()
+include(farm_ng_default_args)
 
-find_package(farm_ng_cmake 0.1.0 REQUIRED)
 farm_ng_module()
 
 find_package(Eigen3 3.4.0 REQUIRED)

infra/scripts/install_deps_ubuntu.sh

@@ -12,7 +12,6 @@ sudo apt-get install \
   libc++-dev \
   libgtest-dev \
   libgoogle-glog-dev \
-  libprotobuf-dev \
-  protobuf-compiler \
+  libatlas-base-dev \
   libsuitesparse-dev \
   ninja-build

infra/scripts/venv_update_prefix_deps.sh

@@ -5,16 +5,14 @@ set -ex
 ROOT_DIR="$(cd "$(dirname "${BASH_SOURCE[0]}")/.." >/dev/null 2>&1 && pwd)"
 
 
-RELEASE_SHA= b6feaaf2ab71bf8b695d0e405d39a8a6dde2f883
+RELEASE_SHA=f9f3bb6
 
 # If the needed RELEASE_SHA doesn't match what we have, download
 if ! grep -q $RELEASE_SHA "$ROOT_DIR/venv/prefix/release_version.txt"; then
   mkdir -p "$ROOT_DIR/venv"
   $ROOT_DIR/../cmake/scripts/download_release.sh
   rm -rf $ROOT_DIR/venv/prefix
-  tar -xzf $ROOT_DIR/venv/venv.tar.gz --strip-components=1 -C $ROOT_DIR/venv
-
-
+  tar -xzf $ROOT_DIR/../cmake/scripts/venv.tar.gz --strip-components=1 -C $ROOT_DIR/
   echo "$RELEASE_SHA" > $ROOT_DIR/venv/prefix/release_version.txt
   echo "[Updated binary dependencies. Done!]"
 else