microsoft · WangWeiLin-MV · Feb 6, 2025 · dg0yt · Feb 8, 2025 · dg0yt
diff --git a/ports/colmap/portfile.cmake b/ports/colmap/portfile.cmake
@@ -31,16 +31,6 @@ set(TESTS_ENABLED OFF)
 set(CGAL_ENABLED OFF)
 set(OPENMP_ENABLED ON)
 
-if("cuda" IN_LIST FEATURES)
-    set(CUDA_ENABLED ON)
-    set(CUDA_ARCHITECTURES "native")
-endif()
-
-if("cuda-redist" IN_LIST FEATURES)
-    set(CUDA_ENABLED ON)
-    set(CUDA_ARCHITECTURES "all-major")
-endif()
-
 if("gui" IN_LIST FEATURES)
     set(GUI_ENABLED ON)
 endif()
@@ -61,8 +51,8 @@ vcpkg_cmake_configure(
     SOURCE_PATH "${SOURCE_PATH}"
     DISABLE_PARALLEL_CONFIGURE
     OPTIONS
-        -DCUDA_ENABLED=${CUDA_ENABLED}
-        -DCMAKE_CUDA_ARCHITECTURES=${CUDA_ARCHITECTURES}
+        -DOPENGL_ENABLED=OFF
+        -DCUDA_ENABLED=OFF
         -DGUI_ENABLED=${GUI_ENABLED}
         -DTESTS_ENABLED=${TESTS_ENABLED}
         -DGIT_COMMIT_ID=${GIT_COMMIT_ID}

diff --git a/ports/colmap/vcpkg.json b/ports/colmap/vcpkg.json
@@ -1,7 +1,7 @@
 {
   "name": "colmap",
   "version": "3.11.1",
-  "port-version": 1,
+  "port-version": 2,
   "description": "COLMAP is a general-purpose Structure-from-Motion (SfM) and Multi-View Stereo (MVS) pipeline with a graphical and command-line interface. It offers a wide range of features for reconstruction of ordered and unordered image collections. The software is licensed under the new BSD license.",
   "homepage": "https://colmap.github.io/",
   "license": "BSD-3-Clause",
@@ -51,19 +51,6 @@
         "cgal"
       ]
     },
-    "cuda": {
-      "description": "Build with CUDA.",
-      "dependencies": [
-        "cuda",
-        "glew"
-      ]
-    },
-    "cuda-redist": {
-      "description": "Redistributable CUDA support for common supported compute architectures.",
-      "dependencies": [
-        "cuda"
-      ]
-    },
     "gui": {
       "description": "Build the GUI.",
       "dependencies": [

diff --git a/ports/freetype-gl/0006-link-targets-glew.patch b/ports/freetype-gl/0006-link-targets-glew.patch
@@ -0,0 +1,31 @@
+diff --git a/CMakeLists.txt b/CMakeLists.txt
+index 4f8d7dd..40d72f8 100644
+--- a/CMakeLists.txt
++++ b/CMakeLists.txt
+@@ -112,7 +112,7 @@ include_directories(
+     ${OPENGL_INCLUDE_DIRS}
+     ${FREETYPE_INCLUDE_DIRS}
+     ${CMAKE_CURRENT_SOURCE_DIR}
+-    ${GLEW_INCLUDE_PATH}
++
+     ${PROJECT_BINARY_DIR}
+ )
+
+@@ -196,7 +196,7 @@ target_link_libraries(freetype-gl
+                       ${OPENGL_LIBRARY}
+                       ${FREETYPE_LIBRARIES}
+                       ${MATH_LIBRARY}
+-                      ${GLEW_LIBRARY}
++                      GLEW::GLEW
+ )
+
+ if(freetype-gl_BUILD_MAKEFONT)
+@@ -207,7 +207,7 @@ if(freetype-gl_BUILD_MAKEFONT)
+         ${OPENGL_LIBRARY}
+         ${FREETYPE_LIBRARIES}
+         ${MATH_LIBRARY}
+-        ${GLEW_LIBRARY}
++        GLEW::GLEW
+     )
+
+     if(MSVC AND NOT (MSVC_VERSION LESS 1900))
diff --git a/ports/freetype-gl/portfile.cmake b/ports/freetype-gl/portfile.cmake
@@ -12,6 +12,7 @@ vcpkg_from_github(
         0003-Add-exports.patch
         0004-Change-install-dir-for-pkgconfig.patch
         0005-add-version.patch
+        0006-link-targets-glew.patch
 )
 
 vcpkg_check_features(

diff --git a/ports/freetype-gl/vcpkg.json b/ports/freetype-gl/vcpkg.json
@@ -1,6 +1,7 @@
 {
   "name": "freetype-gl",
   "version": "1.0",
+  "port-version": 1,
   "description": "OpenGL text using one vertex buffer, one texture and FreeType",
   "homepage": "https://github.com/rougier/freetype-gl",
   "dependencies": [

diff --git a/ports/glew/0004-definition-GLEW_NO_GLU.patch b/ports/glew/0004-definition-GLEW_NO_GLU.patch
@@ -0,0 +1,12 @@
+diff --git a/build/cmake/CMakeLists.txt b/build/cmake/CMakeLists.txt
+index 25fb90b..68b977d 100644
+--- a/build/cmake/CMakeLists.txt
++++ b/build/cmake/CMakeLists.txt
+@@ -155,6 +155,7 @@ if(CMAKE_VERSION VERSION_LESS 2.8.12)
+ else()
+   target_compile_definitions(glew_s INTERFACE "GLEW_STATIC")
+   foreach(t glew glew_s)
++    target_compile_definitions(${t} PUBLIC $<INSTALL_INTERFACE:GLEW_NO_GLU>)
+     target_include_directories(${t} PUBLIC $<INSTALL_INTERFACE:include>)
+   endforeach()
+   set(MAYBE_EXPORT EXPORT glew-targets)
diff --git a/ports/glew/portfile.cmake b/ports/glew/portfile.cmake
@@ -17,6 +17,7 @@ vcpkg_extract_source_archive(
     PATCHES
         fix-LNK2019.patch
         base_address.patch # Accepted upstream as https://github.com/nigels-com/glew/commit/ef7d12ecb7f1f336f6d3a80cebd6163b2c094108
+        0004-definition-GLEW_NO_GLU.patch
 )
 
 vcpkg_cmake_configure(

diff --git a/ports/glew/vcpkg.json b/ports/glew/vcpkg.json
@@ -1,7 +1,7 @@
 {
   "name": "glew",
   "version": "2.2.0",
-  "port-version": 4,
+  "port-version": 5,
   "description": "The OpenGL Extension Wrangler Library (GLEW) is a cross-platform open-source C/C++ extension loading library.",
   "homepage": "https://github.com/nigels-com/glew",
   "supports": "!android",

diff --git a/versions/baseline.json b/versions/baseline.json
@@ -1794,7 +1794,7 @@
     },
     "colmap": {
       "baseline": "3.11.1",
-      "port-version": 1
+      "port-version": 2
     },
     "color-console": {
       "baseline": "2022-03-20",
@@ -2922,7 +2922,7 @@
     },
     "freetype-gl": {
       "baseline": "1.0",
-      "port-version": 0
+      "port-version": 1
     },
     "freexl": {
       "baseline": "2.0.0",
@@ -3130,7 +3130,7 @@
     },
     "glew": {
       "baseline": "2.2.0",
-      "port-version": 4
+      "port-version": 5
     },
     "glfw3": {
       "baseline": "3.4",

diff --git a/versions/c-/colmap.json b/versions/c-/colmap.json
@@ -1,5 +1,10 @@
 {
   "versions": [
+    {
+      "git-tree": "14eb5a12afab6ead03f10d6cd08da710c9dfbc9d",
+      "version": "3.11.1",
+      "port-version": 2
+    },
     {
       "git-tree": "7f2f32bedf07a0ac7a5bc43b81268b20b41b060e",
       "version": "3.11.1",

diff --git a/versions/f-/freetype-gl.json b/versions/f-/freetype-gl.json
@@ -1,5 +1,10 @@
 {
   "versions": [
+    {
+      "git-tree": "71dfebb898ff8cecac6cc59d8a865a56712a783f",
+      "version": "1.0",
+      "port-version": 1
+    },
     {
       "git-tree": "214e21b36f0f4b0ae0d9514eed1eba20f3c2ff4d",
       "version": "1.0",

diff --git a/versions/g-/glew.json b/versions/g-/glew.json
@@ -1,5 +1,10 @@
 {
   "versions": [
+    {
+      "git-tree": "3c70117b6ee330758f04a593be04d75a5d45fdd8",
+      "version": "2.2.0",
+      "port-version": 5
+    },
     {
       "git-tree": "bf42d73479dcd0f239b71dbed4d0d3af22efb294",
       "version": "2.2.0",