Fix timeout for job and fix cmake

NeoGeographyToolkit · Dec 8, 2023 · a28bab4 · a28bab4
1 parent 365e1d9
commit a28bab4
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 7 deletions.
diff --git a/.github/workflows/ssh.yml b/.github/workflows/ssh.yml
@@ -27,7 +27,7 @@ jobs:
           ${{ runner.os }}-
     - name: Setup tmate session
       uses: mxschmitt/action-tmate@v3
-      timeout-minutes: 60
+      timeout-minutes: 600
       with:
         limit-access-to-actor: true
         ##limit-access-to-users: oleg-alexandrov

diff --git a/src/asp/CMakeLists.txt b/src/asp/CMakeLists.txt
@@ -196,12 +196,7 @@ find_external_library(SPICE ${ASP_DEPS_DIR} "cspice" "cspice" REQUIRED)
 find_external_library(GEOID ${ASP_DEPS_DIR} "" "egm2008" REQUIRED)
 find_external_library(XERCESC ${ASP_DEPS_DIR} "" "xerces-c" REQUIRED)
 find_external_library(PROTOBUF ${ASP_DEPS_DIR} "" "protobuf" REQUIRED)
-# TODO(oalexan1): Must use embree3 on Linux as well
-if (APPLE)
-  find_external_library(EMBREE ${ASP_DEPS_DIR} "" "embree3" REQUIRED)
-else()
-  find_external_library(EMBREE ${ASP_DEPS_DIR} "" "embree" REQUIRED)
-endif()
+find_external_library(EMBREE ${ASP_DEPS_DIR} "" "embree3" REQUIRED)
 
 find_external_library(EIGEN ${ASP_DEPS_DIR} "eigen3" "" REQUIRED)
 find_external_library(CERES ${ASP_DEPS_DIR} "ceres" "ceres" REQUIRED)