Browse Source

update submodule

pull/262/head
wqtshg 4 years ago
parent
commit
4d72c0cebe
3 changed files with 11 additions and 4 deletions
  1. +4
    -1
      CMakeLists.txt
  2. +6
    -2
      cmake/external_libs/json.cmake
  3. +1
    -1
      metadef

+ 4
- 1
CMakeLists.txt View File

@@ -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)



+ 6
- 2
cmake/external_libs/json.cmake View File

@@ -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


+ 1
- 1
metadef

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

Loading…
Cancel
Save