From 70ea54d67e130d87a0dcc2c051db9a0d2b655478 Mon Sep 17 00:00:00 2001 From: taoxiangdong Date: Thu, 22 Oct 2020 13:06:01 +0800 Subject: [PATCH] update json cmake --- cmake/external_libs/json.cmake | 4 ++-- metadef | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/cmake/external_libs/json.cmake b/cmake/external_libs/json.cmake index d6867a2..cf020b4 100755 --- a/cmake/external_libs/json.cmake +++ b/cmake/external_libs/json.cmake @@ -4,11 +4,11 @@ endif() include(ExternalProject) -set(JSON_SRC_DIR ${PARSER_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 e79f450..765d857 160000 --- a/metadef +++ b/metadef @@ -1 +1 @@ -Subproject commit e79f45025b95a7295bdffa38a1b720bfd6609ae9 +Subproject commit 765d85777ec10fe819799cd2c1b60db49be7c749