Browse Source

Pre Merge pull request !1454 from 李磊/master

pull/1454/MERGE
李磊 Gitee 4 years ago
parent
commit
28b593000d
2 changed files with 12 additions and 12 deletions
  1. +8
    -8
      Third_Party_Open_Source_Software_Notice
  2. +4
    -4
      cmake/external_libs/json.cmake

+ 8
- 8
Third_Party_Open_Source_Software_Notice View File

@@ -1,14 +1,14 @@
OPEN SOURCE SOFTWARE NOTICE

Please note we provide an open source software notice along with this product and/or this product firmware (in the following just “this product”). The open source software licenses are granted by the respective right holders. And the open source licenses prevail all other license information with regard to the respective open source software contained in the product, including but not limited to End User Software Licensing Agreement. This notice is provided on behalf of Huawei Technologies Co. Ltd. and any of its local subsidiaries which may have provided this product to you in your local country.
Please note we provide an open source software notice along with this product and/or this product firmware (in the following just “this product”). The open source software licenses are granted by the respective right holders. And the open source licenses prevail all other license information with regard to the respective open source software contained in the product, including but not limited to End User Software Licensing Agreement. This notice is provided on behalf of Huawei Technologies Co. Ltd. and any of its local subsidiaries which may have provided this product to you in your local country.

Warranty Disclaimer
Warranty Disclaimer
THE OPEN SOURCE SOFTWARE IN THIS PRODUCT IS DISTRIBUTED IN THE HOPE THAT IT WILL BE USEFUL, BUT WITHOUT ANY WARRANTY, WITHOUT EVEN THE IMPLIED WARRANTY OF MERCHANTABILITY OR FITNESS FOR A PARTICULAR PURPOSE. SEE THE APPLICABLE LICENSES FOR MORE DETAILS.

Copyright Notice and License Texts
Copyright Notice and License Texts

Software: Eigen 3.3.7
Copyright notice:
Copyright notice:
Copyright (C) 2014 Benoit Steiner <benoit.steiner.goog@gmail.com>
Copyright (C) 2013 Christian Seiler <christian@iwakd.de>
Copyright (C) 2015 Eugene Brevdo <ebrevdo@gmail.com>
@@ -328,8 +328,8 @@ Exhibit B - “Incompatible With Secondary Licenses” Notice
This Source Code Form is “Incompatible With Secondary Licenses”, as defined by the Mozilla Public License, v. 2.0.


Software: JSON for Modern C++ 3.6.1
Copyright notice:
Software: JSON for Modern C++ 3.7.3
Copyright notice:
Copyright 2015 Google Inc. All rights reserved.
Copyright 2018 Google Inc. All rights reserved.
Copyright 2016 Ismael Jimenez Martinez. All rights reserved.
@@ -370,7 +370,7 @@ THE SOFTWARE.


Software: google/protobuf 3.8.0
Copyright notice:
Copyright notice:
Copyright 2008, Google Inc.
Copyright 2008 Google Inc. All Rights Reserved.
Copyright [2007] Neal Norwitz
@@ -413,7 +413,7 @@ THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND


Software: googletest 1.8.1
Copyright notice:
Copyright notice:
Copyright 2009, Google Inc.
Copyright 2008, Google Inc.
Copyright 2007 Google Inc.


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

@@ -7,15 +7,15 @@ include(ExternalProject)
set(JSON_SRC_DIR ${CMAKE_BINARY_DIR}/opensrc/json/include)
if (GE_PB_PKG)
set(REQ_URL "${GE_PB_PKG}/libs/ge_nlohmann_json/include.zip")
set(MD5 "0dc903888211db3a0f170304cd9f3a89")
set(MD5 "fb96f95cdf609143e998db401ca4f324")
set(JSON_INCLUDE_DIR ${JSON_SRC_DIR})
#elseif (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()
set(REQ_URL "https://github.com/nlohmann/json/releases/download/v3.6.1/include.zip")
set(MD5 "0dc903888211db3a0f170304cd9f3a89")
set(REQ_URL "https://github.com/nlohmann/json/releases/download/v3.7.3/include.zip")
set(MD5 "fb96f95cdf609143e998db401ca4f324")
set(JSON_INCLUDE_DIR ${JSON_SRC_DIR})
endif ()
ExternalProject_Add(json_build
@@ -26,7 +26,7 @@ ExternalProject_Add(json_build
CONFIGURE_COMMAND ""
BUILD_COMMAND ""
INSTALL_COMMAND ""
EXCLUDE_FROM_ALL TRUE
EXCLUDE_FROM_ALL TRUE
)




Loading…
Cancel
Save