[freeglut] Fix build with CMake4.0 (microsoft#44495)

Mengna-Li · Mengna-Li · web-flow · commit 5c6220035e9d · 2025-03-21T01:11:27.000-07:00
Co-authored-by: Mengna-Li &lt;v-limengna@microsoft.com&gt;
diff --git a/ports/freeglut/cmake-version.patch b/ports/freeglut/cmake-version.patch
@@ -0,0 +1,10 @@
+diff --git a/CMakeLists.txt b/CMakeLists.txt
+index 9a5fb2b..a9ddfea 100644
+--- a/CMakeLists.txt
++++ b/CMakeLists.txt
+@@ -1,4 +1,4 @@
+-CMAKE_MINIMUM_REQUIRED(VERSION 3.1 FATAL_ERROR)
++CMAKE_MINIMUM_REQUIRED(VERSION 3.1...3.5 FATAL_ERROR)
+ PROJECT(freeglut LANGUAGES C)
+ 
+ if (POLICY CMP0072)
diff --git a/ports/freeglut/portfile.cmake b/ports/freeglut/portfile.cmake
@@ -9,6 +9,7 @@ vcpkg_from_github(
         x11-dependencies-export.patch
         fix-debug-macro.patch
         windows-output-name.patch
+        cmake-version.patch
 )
 
 if(VCPKG_TARGET_IS_OSX)
diff --git a/ports/freeglut/vcpkg.json b/ports/freeglut/vcpkg.json
@@ -1,6 +1,7 @@
 {
   "name": "freeglut",
   "version": "3.6.0",
+  "port-version": 1,
   "description": "A free OpenGL utility toolkit, the open-sourced alternative to the GLUT library.",
   "homepage": "https://sourceforge.net/projects/freeglut/",
   "license": null,
diff --git a/versions/baseline.json b/versions/baseline.json
@@ -2926,7 +2926,7 @@
     },
     "freeglut": {
       "baseline": "3.6.0",
-      "port-version": 0
+      "port-version": 1
     },
     "freeimage": {
       "baseline": "3.18.0",
diff --git a/versions/f-/freeglut.json b/versions/f-/freeglut.json
@@ -1,5 +1,10 @@
 {
   "versions": [
+    {
+      "git-tree": "2b2ff4479793417da25f0324620f2ce3373de98b",
+      "version": "3.6.0",
+      "port-version": 1
+    },
     {
       "git-tree": "501dfdaa34842155768b87802ae16c0d99baa820",
       "version": "3.6.0",

Original file line number	Diff line number	Diff line change
`@@ -9,6 +9,7 @@ vcpkg_from_github(`
`9`	`9`	`x11-dependencies-export.patch`
`10`	`10`	`fix-debug-macro.patch`
`11`	`11`	`windows-output-name.patch`
	`12`	`+ cmake-version.patch`
`12`	`13`	`)`
`13`	`14`
`14`	`15`	`if(VCPKG_TARGET_IS_OSX)`
Original file line number	Diff line number	Diff line change
`@@ -1,6 +1,7 @@`
`1`	`1`	`{`
`2`	`2`	`"name": "freeglut",`
`3`	`3`	`"version": "3.6.0",`
	`4`	`+ "port-version": 1,`
`4`	`5`	`"description": "A free OpenGL utility toolkit, the open-sourced alternative to the GLUT library.",`
`5`	`6`	`"homepage": "https://sourceforge.net/projects/freeglut/",`
`6`	`7`	`"license": null,`
Original file line number	Diff line number	Diff line change
`@@ -1,5 +1,10 @@`
`1`	`1`	`{`
`2`	`2`	`"versions": [`
	`3`	`+ {`
	`4`	`+ "git-tree": "2b2ff4479793417da25f0324620f2ce3373de98b",`
	`5`	`+ "version": "3.6.0",`
	`6`	`+ "port-version": 1`
	`7`	`+ },`
`3`	`8`	`{`
`4`	`9`	`"git-tree": "501dfdaa34842155768b87802ae16c0d99baa820",`
`5`	`10`	`"version": "3.6.0",`