Browse Source

update json cmake

tags/v1.1.0
taoxiangdong 3 years ago
parent
commit
12504ba947
3 changed files with 4 additions and 4 deletions
  1. +2
    -2
      cmake/external_libs/json.cmake
  2. +1
    -1
      metadef
  3. +1
    -1
      parser

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

@@ -4,11 +4,11 @@ endif()


include(ExternalProject) 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 ExternalProject_Add(json_build
URL https://github.com/nlohmann/json/releases/download/v3.6.1/include.zip URL https://github.com/nlohmann/json/releases/download/v3.6.1/include.zip
#URL /home/txd/workspace/cloud_code/pkg/include.zip #URL /home/txd/workspace/cloud_code/pkg/include.zip
#SOURCE_DIR ${JSON_SRC_DIR}
SOURCE_DIR ${JSON_SRC_DIR}
CONFIGURE_COMMAND "" CONFIGURE_COMMAND ""
BUILD_COMMAND "" BUILD_COMMAND ""
INSTALL_COMMAND "" INSTALL_COMMAND ""


+ 1
- 1
metadef

@@ -1 +1 @@
Subproject commit e79f45025b95a7295bdffa38a1b720bfd6609ae9
Subproject commit 765d85777ec10fe819799cd2c1b60db49be7c749

+ 1
- 1
parser

@@ -1 +1 @@
Subproject commit be653a17038395f3901d43b600a51f6ab33af5e5
Subproject commit 5ea9437bbef262e2e5428fa52f0f2e5547890cb2

Loading…
Cancel
Save