haikuprojects/haikuports
1
0
Fork 0
mirror of https://github.com/yann64/haikuports.git synced 2026-04-22 11:40:06 +02:00
Code Issues Packages Projects Releases Wiki Activity

Ceres: cleanup (#6657)

Browse Source
This commit is contained in:
extrowerk
2022-02-27 21:17:57 +01:00
committed by GitHub
parent a82742a4a5
commit 12b7e9c729
2 changed files with 0 additions and 48 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
sci-libs/ceres_solver/ceres_solver-2.0.1~git.recipe
View File

@@ -14,7 +14,6 @@ SOURCE_URI="https://github.com/ceres-solver/ceres-solver/archive/$srcGitRev.tar.
CHECKSUM_SHA256="1a76b9aeb1d8e5565c49ca90a04108242a934270e8d14baeab4dd8672321c9b5"
SOURCE_FILENAME="ceres-solver-$portVersion-tar.gz"
SOURCE_DIR="ceres-solver-$srcGitRev"
#PATCHES="ceres_solver-$portVersion.patchset"
ARCHITECTURES="!x86_gcc2 all"
SECONDARY_ARCHITECTURES="?x86"

47
sci-libs/ceres_solver/patches/ceres_solver-2.0.0.patchset
View File

@@ -1,47 +0,0 @@
From d6c1f99f3f4a2b38f349cf4aefbceefafbfce296 Mon Sep 17 00:00:00 2001
From: begasus <begasus@gmail.com>
Date: Wed, 30 Dec 2020 18:19:10 +0000
Subject: Set paths for install
diff --git a/CMakeLists.txt b/CMakeLists.txt
index ea7e9b8..a415b8f 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -661,21 +661,21 @@ endif (BUILD_EXAMPLES)
# Setup installation of Ceres public headers.
file(GLOB CERES_HDRS ${Ceres_SOURCE_DIR}/include/ceres/*.h)
-install(FILES ${CERES_HDRS} DESTINATION include/ceres)
+install(FILES ${CERES_HDRS} DESTINATION ${CMAKE_INSTALL_INCLUDEDIR}/ceres)
file(GLOB CERES_PUBLIC_INTERNAL_HDRS ${Ceres_SOURCE_DIR}/include/ceres/internal/*.h)
-install(FILES ${CERES_PUBLIC_INTERNAL_HDRS} DESTINATION include/ceres/internal)
+install(FILES ${CERES_PUBLIC_INTERNAL_HDRS} DESTINATION ${CMAKE_INSTALL_INCLUDEDIR}/ceres/internal)
# Also setup installation of Ceres config.h configured with the current
# build options into the installed headers directory.
install(FILES ${Ceres_BINARY_DIR}/config/ceres/internal/config.h
- DESTINATION include/ceres/internal)
+ DESTINATION ${CMAKE_INSTALL_INCLUDEDIR}/ceres/internal)
if (MINIGLOG)
# Install miniglog header if being used as logging #includes appear in
# installed public Ceres headers.
install(FILES ${Ceres_SOURCE_DIR}/internal/ceres/miniglog/glog/logging.h
- DESTINATION include/ceres/internal/miniglog/glog)
+ DESTINATION ${CMAKE_INSTALL_INCLUDEDIR}/ceres/internal/miniglog/glog)
endif (MINIGLOG)
# Ceres supports two mechanisms by which it can be detected & imported into
@@ -720,7 +720,7 @@ write_basic_package_version_file("${Ceres_BINARY_DIR}/CeresConfigVersion.cmake"
if (WIN32)
set(RELATIVE_CMAKECONFIG_INSTALL_DIR CMake)
else ()
- set(RELATIVE_CMAKECONFIG_INSTALL_DIR lib${LIB_SUFFIX}/cmake/Ceres)
+ set(RELATIVE_CMAKECONFIG_INSTALL_DIR ${CMAKE_INSTALL_LIBDIR}${LIB_SUFFIX}/cmake/Ceres)
endif ()
# This "exports" for installation all targets which have been put into the
--
2.28.0