Merge branch 'ApraNVR_CommonBuild' of https://github.com/Apra-Labs/Ap…

…raPipes into ApraNVR_CommonBuild
Apra-Labs · May 29, 2024 · 86d235f · 86d235f
2 parents 560b955 + 29e23b4
commit 86d235f
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 9 deletions.
diff --git a/base/CMakeLists.txt b/base/CMakeLists.txt
@@ -53,6 +53,7 @@ find_package(whisper CONFIG REQUIRED)
 IF(ENABLE_LINUX)
 	find_package(GLEW REQUIRED)
 	find_package(glfw3 CONFIG REQUIRED)
+	find_package(FreeGLUT CONFIG REQUIRED)
 	pkg_check_modules(GTK3 REQUIRED gtk+-3.0)
 	pkg_check_modules(GDK3 REQUIRED gdk-3.0)
 	pkg_check_modules(GIO REQUIRED gio-2.0)

diff --git a/base/vcpkg.json b/base/vcpkg.json
@@ -36,15 +36,7 @@
         "webp"
       ]
     },
-    {
-      "name": "opencv4",
-      "default-features": false,
-      "features": [
-        "gtk"
-      ],
-      "platform": "(linux & x64)",
-      "$reason": "skip linux:arm64 and windows"
-    },
+    "freeglut",
     "ffmpeg",
     "openh264-apra",
     "glfw3",