[ceres] Fix static library path on Linux (#15362)

* [ceres] Fix static library path on Linux

* [ceres] Bump version

* update version record
This commit is contained in:
Jack·Boos·Yu 2021-04-02 01:41:01 +08:00 committed by GitHub
parent c02feb90c2
commit fecd9f1449
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
5 changed files with 21 additions and 2 deletions

View File

@ -0,0 +1,13 @@
diff --git a/CMakeLists.txt b/CMakeLists.txt
index f24ce30..8e5759b 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -192,7 +192,7 @@ endif()
# install native libraries to lib64 rather than lib. Most distros seem to
# follow this convention with a couple notable exceptions (Debian-based and
# Arch-based distros) which we try to detect here.
-if (CMAKE_SYSTEM_NAME MATCHES "Linux" AND
+if (0 AND CMAKE_SYSTEM_NAME MATCHES "Linux" AND
NOT DEFINED LIB_SUFFIX AND
NOT CMAKE_CROSSCOMPILING AND
CMAKE_SIZEOF_VOID_P EQUAL "8" AND

View File

@ -16,6 +16,7 @@ vcpkg_from_github(
0001_cmakelists_fixes.patch
0002_use_glog_target.patch
0003_fix_exported_ceres_config.patch
0004_fix_lib_path_linux.patch
find-package-required.patch
)

View File

@ -1,7 +1,7 @@
{
"name": "ceres",
"version-semver": "2.0.0",
"port-version": 3,
"port-version": 4,
"description": "non-linear optimization package",
"homepage": "https://github.com/ceres-solver/ceres-solver",
"dependencies": [

View File

@ -1138,7 +1138,7 @@
},
"ceres": {
"baseline": "2.0.0",
"port-version": 3
"port-version": 4
},
"cfitsio": {
"baseline": "3.49",

View File

@ -1,5 +1,10 @@
{
"versions": [
{
"git-tree": "ba834e4ef32213f516d2b0539240ba4cc4a9c90a",
"version-semver": "2.0.0",
"port-version": 4
},
{
"git-tree": "bfe64de75017dfef5a1dbd6b034078a0316201c8",
"version-semver": "2.0.0",