diff --git a/Fix-FindTBB-version-detection-with-TBB-2021.1.1.patch b/Fix-FindTBB-version-detection-with-TBB-2021.1.1.patch deleted file mode 100644 index f5417979b363941ecb32e1e13c36e105bb6b864d..0000000000000000000000000000000000000000 --- a/Fix-FindTBB-version-detection-with-TBB-2021.1.1.patch +++ /dev/null @@ -1,40 +0,0 @@ -From 9aa52c6ff74358d1b91542221e0545bb61bdedcc Sun May 15 00:00:00 2001 -From: Alexs Mayorga -Date: Sun, 15 May 2021 10:47:19 +0800 -Subject: [PATCH] Fix FindTBB version detection with TBB >= 2021.1.1 - ---- - cmake/FindTBB.cmake | 15 ++++++++++++++- - 1 file changed, 14 insertions(+), 1 deletion(-) - -diff --git a/cmake/FindTBB.cmake b/cmake/FindTBB.cmake -index 5ae7b61..10e540d 100644 ---- a/cmake/FindTBB.cmake -+++ b/cmake/FindTBB.cmake -@@ -429,10 +429,23 @@ findpkg_finish(TBB_MALLOC_PROXY tbbmalloc_proxy) - #============================================================================= - #parse all the version numbers from tbb - if(NOT TBB_VERSION) -+ set(TBB_VERSION_FILE_PRIOR_TO_TBB_2021_1 -+ "${TBB_INCLUDE_DIR}/tbb/tbb_stddef.h") -+ set(TBB_VERSION_FILE_AFTER_TBB_2021_1 -+ "${TBB_INCLUDE_DIR}/oneapi/tbb/version.h") -+ -+ if (EXISTS "${TBB_VERSION_FILE_PRIOR_TO_TBB_2021_1}") -+ set(TBB_VERSION_FILE "${TBB_VERSION_FILE_PRIOR_TO_TBB_2021_1}") -+ elseif (EXISTS "${TBB_VERSION_FILE_AFTER_TBB_2021_1}") -+ set(TBB_VERSION_FILE "${TBB_VERSION_FILE_AFTER_TBB_2021_1}") -+ else() -+ message(FATAL_ERROR "Found TBB installation: ${TBB_INCLUDE_DIR} " -+ "missing version header.") -+ endif() - - #only read the start of the file - file(STRINGS -- "${TBB_INCLUDE_DIR}/tbb/tbb_stddef.h" -+ "${TBB_VERSION_FILE}" - TBB_VERSION_CONTENTS - REGEX "VERSION") - --- -2.43.0 diff --git a/ceres-solver-2.0.0.tar.gz b/ceres-solver-2.2.0.tar.gz similarity index 46% rename from ceres-solver-2.0.0.tar.gz rename to ceres-solver-2.2.0.tar.gz index ebdb8e668384c59bcaf52ab34c974057056993a1..3387f6bd59fe785cbf77497cea3246caafbfb3eb 100644 Binary files a/ceres-solver-2.0.0.tar.gz and b/ceres-solver-2.2.0.tar.gz differ diff --git a/ceres-solver.spec b/ceres-solver.spec index d81780aa1406959e69791d76d25906ce4e9a4d42..088b053d2316e1f55792ed093ab42503964a0446 100644 --- a/ceres-solver.spec +++ b/ceres-solver.spec @@ -1,13 +1,12 @@ Name: ceres-solver -Version: 2.0.0 -Release: 3 +Version: 2.2.0 +Release: 1 Summary: A non-linear least squares minimizer License: MIT and Apache-2.0 URL: http://ceres-solver.org/ Source0: http://%{name}.org/%{name}-%{version}.tar.gz -Patch0: Fix-FindTBB-version-detection-with-TBB-2021.1.1.patch %global blaslib openblas @@ -44,6 +43,7 @@ developing applications that use %{name}. %autosetup -p1 %build +export HAVE_CXX17="1" %cmake \ -DCXSPARSE_INCLUDE_DIR:PATH=%{_includedir}/suitesparse \ -DBLAS_LIBRARIES=-l%{blaslib} \ @@ -64,6 +64,9 @@ developing applications that use %{name}. %{_libdir}/cmake/Ceres %changelog +* Mon Jan 20 2025 Ge Wang - 2.2.0-1 +- Update to version 2.2.0 + * Tue Jan 07 2025 wangkai <13474090681@163.com> - 2.0.0-3 - adopt to new cmake macro