From 4d72c0cebe1c2e68e7d9e418858071e02ea89b9c Mon Sep 17 00:00:00 2001 From: wqtshg Date: Thu, 18 Mar 2021 16:42:50 +0800 Subject: [PATCH] update submodule --- CMakeLists.txt | 5 ++++- cmake/external_libs/json.cmake | 8 ++++++-- metadef | 2 +- 3 files changed, 11 insertions(+), 4 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index 5394587..f893e81 100644 --- a/CMakeLists.txt +++ b/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) diff --git a/cmake/external_libs/json.cmake b/cmake/external_libs/json.cmake index b36cb9a..f486752 100755 --- a/cmake/external_libs/json.cmake +++ b/cmake/external_libs/json.cmake @@ -5,15 +5,19 @@ 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 "0dc903888211db3a0f170304cd9f3a89") + set(JSON_INCLUDE_DIR ${JSON_SRC_DIR}) #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") -#else() +else() set(REQ_URL "https://github.com/nlohmann/json/releases/download/v3.6.1/include.zip") set(MD5 "0dc903888211db3a0f170304cd9f3a89") set(JSON_INCLUDE_DIR ${JSON_SRC_DIR}) -#endif () +endif () ExternalProject_Add(json_build URL ${REQ_URL} #URL /home/txd/workspace/cloud_code/pkg/include.zip diff --git a/metadef b/metadef index 3a4c3b7..5f74940 160000 --- a/metadef +++ b/metadef @@ -1 +1 @@ -Subproject commit 3a4c3b746cffcb2e1e5cc1c8a7559a07da3dd84e +Subproject commit 5f7494049e8f8d83425ff2b4bc22e74cb6dff866