From 12504ba947aca350fe8941a522d9fb5aee3751f5 Mon Sep 17 00:00:00 2001 From: taoxiangdong Date: Thu, 22 Oct 2020 13:09:14 +0800 Subject: [PATCH] update json cmake --- cmake/external_libs/json.cmake | 4 ++-- metadef | 2 +- parser | 2 +- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/cmake/external_libs/json.cmake b/cmake/external_libs/json.cmake index fd939bf2..cf020b40 100755 --- a/cmake/external_libs/json.cmake +++ b/cmake/external_libs/json.cmake @@ -4,11 +4,11 @@ endif() include(ExternalProject) -set(JSON_SRC_DIR ${GE_CODE_DIR}/../third_party/json/include) +set(JSON_SRC_DIR ${CMAKE_BINARY_DIR}/opensrc/json/include) ExternalProject_Add(json_build URL https://github.com/nlohmann/json/releases/download/v3.6.1/include.zip #URL /home/txd/workspace/cloud_code/pkg/include.zip - #SOURCE_DIR ${JSON_SRC_DIR} + SOURCE_DIR ${JSON_SRC_DIR} CONFIGURE_COMMAND "" BUILD_COMMAND "" INSTALL_COMMAND "" diff --git a/metadef b/metadef index e79f4502..765d8577 160000 --- a/metadef +++ b/metadef @@ -1 +1 @@ -Subproject commit e79f45025b95a7295bdffa38a1b720bfd6609ae9 +Subproject commit 765d85777ec10fe819799cd2c1b60db49be7c749 diff --git a/parser b/parser index be653a17..5ea9437b 160000 --- a/parser +++ b/parser @@ -1 +1 @@ -Subproject commit be653a17038395f3901d43b600a51f6ab33af5e5 +Subproject commit 5ea9437bbef262e2e5428fa52f0f2e5547890cb2