mirror of
https://github.com/microsoft/vcpkg.git
synced 2025-06-07 12:06:49 +08:00
[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:
parent
c02feb90c2
commit
fecd9f1449
13
ports/ceres/0004_fix_lib_path_linux.patch
Normal file
13
ports/ceres/0004_fix_lib_path_linux.patch
Normal 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
|
@ -16,6 +16,7 @@ vcpkg_from_github(
|
|||||||
0001_cmakelists_fixes.patch
|
0001_cmakelists_fixes.patch
|
||||||
0002_use_glog_target.patch
|
0002_use_glog_target.patch
|
||||||
0003_fix_exported_ceres_config.patch
|
0003_fix_exported_ceres_config.patch
|
||||||
|
0004_fix_lib_path_linux.patch
|
||||||
find-package-required.patch
|
find-package-required.patch
|
||||||
)
|
)
|
||||||
|
|
||||||
|
@ -1,7 +1,7 @@
|
|||||||
{
|
{
|
||||||
"name": "ceres",
|
"name": "ceres",
|
||||||
"version-semver": "2.0.0",
|
"version-semver": "2.0.0",
|
||||||
"port-version": 3,
|
"port-version": 4,
|
||||||
"description": "non-linear optimization package",
|
"description": "non-linear optimization package",
|
||||||
"homepage": "https://github.com/ceres-solver/ceres-solver",
|
"homepage": "https://github.com/ceres-solver/ceres-solver",
|
||||||
"dependencies": [
|
"dependencies": [
|
||||||
|
@ -1138,7 +1138,7 @@
|
|||||||
},
|
},
|
||||||
"ceres": {
|
"ceres": {
|
||||||
"baseline": "2.0.0",
|
"baseline": "2.0.0",
|
||||||
"port-version": 3
|
"port-version": 4
|
||||||
},
|
},
|
||||||
"cfitsio": {
|
"cfitsio": {
|
||||||
"baseline": "3.49",
|
"baseline": "3.49",
|
||||||
|
@ -1,5 +1,10 @@
|
|||||||
{
|
{
|
||||||
"versions": [
|
"versions": [
|
||||||
|
{
|
||||||
|
"git-tree": "ba834e4ef32213f516d2b0539240ba4cc4a9c90a",
|
||||||
|
"version-semver": "2.0.0",
|
||||||
|
"port-version": 4
|
||||||
|
},
|
||||||
{
|
{
|
||||||
"git-tree": "bfe64de75017dfef5a1dbd6b034078a0316201c8",
|
"git-tree": "bfe64de75017dfef5a1dbd6b034078a0316201c8",
|
||||||
"version-semver": "2.0.0",
|
"version-semver": "2.0.0",
|
||||||
|
Loading…
Reference in New Issue
Block a user