Merge commit '82fea30fcce1d169de7ec42be84d079e0899519c' into feature/update-dependenies

2026-04-24 00:00:05 +08:00 · 2018-01-08 11:44:56 +03:00
parent 9ce5e4c989 82fea30fcc
commit 31ceba3bd6
437 changed files with 7377 additions and 2864 deletions
@@ -15,5 +15,12 @@ PARMS = {
        'asio'     : "asio-20170227",
        'mbedtls'  : "mbedtls-2.4.0",
        'lz4'      : "lz4-1.7.5",
-        }
+    },
+    "GTEST_ROOT": ""
 }
+
+try:
+    from parms_local import PARMS as parms_local
+    PARMS.update(parms_local)
+except ImportError:
+    pass