Merge commit 'dev' into 'wip/cmake-merge'

Change-Id: I176c40d031be26a1dd1cf08843e448a660598783

1 files changed, 8 insertions, 0 deletions

diff --git a/util/cmake/configurejson2cmake.py b/util/cmake/configurejson2cmake.py
index f870637e15..58ab106555 100755
--- a/util/cmake/configurejson2cmake.py
+++ b/util/cmake/configurejson2cmake.py
@@ -728,6 +728,14 @@ def parseFeature(ctx, feature, data, cm_fh):
         'msvc_mp': None,
         'optimize_debug': None,
         'optimize_size': None,
+        # special case to enable implicit feature on WIN32, until ANGLE is ported
+        'opengl-desktop': {
+            'autoDetect': ''
+        },
+        # special case to disable implicit feature on WIN32, until ANGLE is ported
+        'opengl-dynamic': {
+            'autoDetect': 'OFF'
+        },
         'opengles2': { # special case to disable implicit feature on WIN32, until ANGLE is ported
             'condition': 'NOT WIN32 AND ( NOT APPLE_WATCHOS AND NOT QT_FEATURE_opengl_desktop AND GLESv2_FOUND )'
         },