Skip to content

Commit 7cdd541

Browse files
committed
fix(main/libceres-solver): do not check / folder in CeresConfig.cmake
- Fixes this error during the build of Blender 5.1 on devices which do not allow permission to access the `/` folder: ``` CMake Error at /data/data/com.termux/files/usr/lib/cmake/Ceres/CeresConfig.cmake:85 (message): Failed to find Ceres - Ceres install root: /, determined from relative path from CeresConfig.cmake install location: /data/data/com.termux/files/usr/lib/cmake/Ceres, does not exist. Either the install directory was deleted, or the install tree was only partially relocated outside of CMake after Ceres was built. ```
1 parent 29231c0 commit 7cdd541

2 files changed

Lines changed: 22 additions & 1 deletion

File tree

Lines changed: 21 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,21 @@
1+
Fixes this error when building blender 5.1 on devices which do not allow
2+
permission to access the '/' folder:
3+
4+
CMake Error at /data/data/com.termux/files/usr/lib/cmake/Ceres/CeresConfig.cmake:85 (message):
5+
Failed to find Ceres - Ceres install root: /, determined from relative path
6+
from CeresConfig.cmake install location:
7+
/data/data/com.termux/files/usr/lib/cmake/Ceres, does not exist. Either
8+
the install directory was deleted, or the install tree was only partially
9+
relocated outside of CMake after Ceres was built.
10+
11+
--- a/cmake/CeresConfig.cmake.in
12+
+++ b/cmake/CeresConfig.cmake.in
13+
@@ -143,7 +143,7 @@ if (CERES_WAS_INSTALLED)
14+
get_filename_component(CURRENT_ROOT_INSTALL_DIR
15+
"${CERES_CURRENT_CONFIG_DIR}/@INSTALL_ROOT_REL_CONFIG_INSTALL_DIR@"
16+
ABSOLUTE)
17+
- if (NOT EXISTS ${CURRENT_ROOT_INSTALL_DIR})
18+
+ if (NOT EXISTS ${CURRENT_ROOT_INSTALL_DIR} AND NOT ANDROID)
19+
ceres_report_not_found(
20+
"Ceres install root: ${CURRENT_ROOT_INSTALL_DIR}, "
21+
"determined from relative path from CeresConfig.cmake install location: "

packages/libceres-solver/build.sh

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ TERMUX_PKG_GROUPS="science"
44
TERMUX_PKG_LICENSE="BSD 3-Clause"
55
TERMUX_PKG_MAINTAINER="@termux"
66
TERMUX_PKG_VERSION="2.2.0"
7-
TERMUX_PKG_REVISION=3
7+
TERMUX_PKG_REVISION=4
88
TERMUX_PKG_SRCURL="http://ceres-solver.org/ceres-solver-$TERMUX_PKG_VERSION.tar.gz"
99
TERMUX_PKG_SHA256=48b2302a7986ece172898477c3bcd6deb8fb5cf19b3327bc49969aad4cede82d
1010
TERMUX_PKG_DEPENDS="libc++, eigen, google-glog, gflags"

0 commit comments

Comments
 (0)