fix glog errors on linux, bump opencv version

wpilibsuite · Nov 19, 2024 · f3caf2c · f3caf2c
1 parent f0ff201
commit f3caf2c
Show file tree

Hide file tree

Showing 3 changed files with 7 additions and 3 deletions.
diff --git a/shared/config.gradle b/shared/config.gradle
@@ -15,7 +15,7 @@ nativeUtils {
         configureDependencies {
             opencvYear = "frc2024"
             niLibVersion = "2025.0.0"
-            opencvVersion = "4.8.0-6"
+            opencvVersion = "4.8.0-7"
         }
     }
 }

diff --git a/shared/opencv.gradle b/shared/opencv.gradle
@@ -1,4 +1,4 @@
-def opencvVersion = '4.8.0-6'
+def opencvVersion = '4.8.0-7'
 
 if (project.hasProperty('useCpp') && project.useCpp) {
     model {

diff --git a/wpical/build.gradle b/wpical/build.gradle
@@ -166,7 +166,11 @@ model {
                 nativeUtils.useRequiredLibrary(it, 'ceres')
                 nativeUtils.useRequiredLibrary(it, 'opencv_static')
                 it.cppCompiler.define 'GLOG_USE_GLOG_EXPORT'
-                it.cppCompiler.define('GLOG_DEPRECATED', '__declspec(deprecated)')
+                if (it.targetPlatform.operatingSystem.isWindows()) {
+                    it.cppCompiler.define('GLOG_DEPRECATED', '__declspec(deprecated)')
+                } else {
+                    it.cppCompiler.define('GLOG_DEPRECATED', '[[deprecated]]')
+                }
                 if (it.targetPlatform.operatingSystem.isWindows()) {
                     it.linker.args << 'Gdi32.lib' << 'Shell32.lib' << 'd3d11.lib' << 'd3dcompiler.lib'
                 } else if (it.targetPlatform.operatingSystem.isMacOsX()) {