Merge branch 'master' of gitee.com:ascend/parser into master

CMakeLists.txt

@@ -5,7 +5,10 @@ set(PARSER_DIR ${CMAKE_CURRENT_LIST_DIR})
 
 if (DEFINED ENV{D_PKG_SERVER})
     set(PARSER_PB_PKG $ENV{D_PKG_SERVER})
-endif()
+elseif (DEFINED ENV{MSLIBS_SERVER})
+    set(PARSER_PB_PKG "http://$ENV{MSLIBS_SERVER}:8081")
+    message("Download packages from MSPKG server")
+endif ()
 
 option(ENABLE_OPEN_SRC "Enable graphengine compile in opensource." FALSE)
 

cmake/external_libs/json.cmake

@@ -5,12 +5,11 @@ endif()
 include(ExternalProject)
 
 set(JSON_SRC_DIR ${CMAKE_BINARY_DIR}/opensrc/json/include)
-
 if (PARSER_PB_PKG)
     set(REQ_URL "${PARSER_PB_PKG}/libs/ge_nlohmann_json/include.zip")
-    set(MD5 "")
+    set(MD5 "0dc903888211db3a0f170304cd9f3a89")
     set(JSON_INCLUDE_DIR ${JSON_SRC_DIR})
-#else if (ENABLE_GITEE)
+#if (ENABLE_GITEE)
 #    set(REQ_URL "https://gitee.com/mirrors/JSON-for-Modern-CPP/repository/archive/v3.6.1.zip")
 #    set(MD5 "5bda78ce308e6cfcf614dcf1d5ff27a7")
 #    set(JSON_INCLUDE_DIR "${JSON_SRC_DIR}/include")

metadef

@@ -1 +1 @@
-Subproject commit 3a4c3b746cffcb2e1e5cc1c8a7559a07da3dd84e
+Subproject commit 5f7494049e8f8d83425ff2b4bc22e74cb6dff866