git: ccfdb77d4d3b - main - devel/ode: Fix building with CMake 4
- Go to: [ bottom of page ] [ top of archives ] [ this month ]
Date: Tue, 22 Sep 2026 08:00:17 UTC
The branch main has been updated by arrowd:
URL: https://cgit.FreeBSD.org/ports/commit/?id=ccfdb77d4d3be8d6c1bd2d7868aaa86a02809bb0
commit ccfdb77d4d3be8d6c1bd2d7868aaa86a02809bb0
Author: Gleb Popov <arrowd@FreeBSD.org>
AuthorDate: 2026-09-22 07:57:27 +0000
Commit: Gleb Popov <arrowd@FreeBSD.org>
CommitDate: 2026-09-22 07:59:02 +0000
devel/ode: Fix building with CMake 4
Approved by: portmgr (fixit blanket)
---
devel/ode/files/patch-CMakeLists.txt | 16 +++++++++++-----
1 file changed, 11 insertions(+), 5 deletions(-)
diff --git a/devel/ode/files/patch-CMakeLists.txt b/devel/ode/files/patch-CMakeLists.txt
index cd9da41f7047..616d0811603f 100644
--- a/devel/ode/files/patch-CMakeLists.txt
+++ b/devel/ode/files/patch-CMakeLists.txt
@@ -1,6 +1,12 @@
---- CMakeLists.txt.orig 2025-01-16 14:48:49.000000000 -0800
-+++ CMakeLists.txt 2025-11-22 17:13:28.892206000 -0800
-@@ -43,6 +43,7 @@
+--- CMakeLists.txt.orig 2025-01-16 22:48:49 UTC
++++ CMakeLists.txt
+@@ -1,4 +1,4 @@
+-cmake_minimum_required(VERSION 2.8.12)
++cmake_minimum_required(VERSION 3.5)
+
+ if(POLICY CMP0042)
+ cmake_policy(SET CMP0042 NEW)
+@@ -43,6 +43,7 @@ option(ODE_WIN32_INSTALL_STATIC_LIBS_PDB "Install the
option(ODE_WITH_TESTS "Builds the unit test application." ON)
option(ODE_WIN32_LIB_OUTPUT_NAME_BASED_ON_FLOAT_SIZE "The output name of the library will be based on the size of float, on Windows." ON)
option(ODE_WIN32_INSTALL_STATIC_LIBS_PDB "Install the PDB files for the static libraries (.lib) on Windows." OFF)
@@ -8,7 +14,7 @@
cmake_dependent_option(ODE_WITH_LIBCCD_BOX_CYL "Use libccd for box-cylinder." ON "ODE_WITH_LIBCCD" OFF)
cmake_dependent_option(ODE_WITH_LIBCCD_CAP_CYL "Use libccd for capsule-cylinder." ON "ODE_WITH_LIBCCD" OFF)
-@@ -54,12 +55,6 @@
+@@ -54,12 +55,6 @@ cmake_dependent_option(ODE_WITH_LIBCCD_SYSTEM "Use sys
cmake_dependent_option(ODE_WITH_LIBCCD_CONVEX_SPHERE "Use libccd for convex-sphere." ON "ODE_WITH_LIBCCD" OFF)
cmake_dependent_option(ODE_WITH_LIBCCD_SYSTEM "Use system libccd." OFF "ODE_WITH_LIBCCD" OFF)
@@ -21,7 +27,7 @@
set(ODE_WIN32_STATIC_LIB_POSTFIX_DEBUG "sd" CACHE STRING "The postfix to use when building the library as a static .lib on Windows in DEBUG.")
set(ODE_WIN32_STATIC_LIB_POSTFIX_MINSIZEREL "s" CACHE STRING "The postfix to use when building the library as a static .lib on Windows in MINSIZEREL.")
set(ODE_WIN32_STATIC_LIB_POSTFIX_RELEASE "s" CACHE STRING "The postfix to use when building the library as a static .lib on Windows in RELEASE.")
-@@ -757,12 +752,12 @@
+@@ -757,12 +752,12 @@ string(REGEX REPLACE "/$" "" PACKAGE_RELATIVE_PATH "${
file(RELATIVE_PATH PACKAGE_RELATIVE_PATH "${CMAKE_INSTALL_FULL_LIBDIR}/pkgconfig" "${CMAKE_INSTALL_PREFIX}")
string(REGEX REPLACE "/$" "" PACKAGE_RELATIVE_PATH "${PACKAGE_RELATIVE_PATH}")