Skip to content

Commit f697642

Browse files
committed
modify LICENSE and NOTICE
1 parent fb3a04f commit f697642

File tree

3 files changed

+75
-6
lines changed

3 files changed

+75
-6
lines changed

LICENSE

Lines changed: 56 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -316,3 +316,59 @@ freely, subject to the following restrictions:
316316

317317
Jean-loup Gailly Mark Adler
318318
319+
320+
--------------------------------------------------------------------------------
321+
322+
3rdparty dependency cpr is statically linked in certain binary
323+
distributions. cpr has the following license:
324+
325+
MIT License
326+
327+
Copyright (c) 2017-2021 Huu Nguyen
328+
Copyright (c) 2022 libcpr and many other contributors
329+
330+
Permission is hereby granted, free of charge, to any person obtaining a copy
331+
of this software and associated documentation files (the "Software"), to deal
332+
in the Software without restriction, including without limitation the rights
333+
to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
334+
copies of the Software, and to permit persons to whom the Software is
335+
furnished to do so, subject to the following conditions:
336+
337+
The above copyright notice and this permission notice shall be included in all
338+
copies or substantial portions of the Software.
339+
340+
THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
341+
IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
342+
FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
343+
AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
344+
LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
345+
OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
346+
SOFTWARE.
347+
348+
--------------------------------------------------------------------------------
349+
350+
3rdparty dependency curl is statically linked in certain binary
351+
distributions (as a dependency of cpr). curl has the following license:
352+
353+
COPYRIGHT AND PERMISSION NOTICE
354+
355+
Copyright (c) 1996 - 2025, Daniel Stenberg, <[email protected]>, and many
356+
contributors, see the THANKS file.
357+
358+
All rights reserved.
359+
360+
Permission to use, copy, modify, and distribute this software for any purpose
361+
with or without fee is hereby granted, provided that the above copyright
362+
notice and this permission notice appear in all copies.
363+
364+
THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
365+
IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
366+
FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT OF THIRD PARTY RIGHTS. IN
367+
NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM,
368+
DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR
369+
OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE
370+
OR OTHER DEALINGS IN THE SOFTWARE.
371+
372+
Except as contained in this notice, the name of a copyright holder shall not
373+
be used in advertising or otherwise to promote the sale, use or other dealings
374+
in this Software without prior written authorization of the copyright holder.

NOTICE

Lines changed: 16 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -22,3 +22,19 @@ This product includes software developed by Jean-loup Gailly and Mark Adler
2222
* zlib: A Massively Spiffy Yet Delicately Unobtrusive Compression Library
2323
* Copyright (c) 1995-2024 Jean-loup Gailly and Mark Adler
2424
* https://zlib.net/
25+
26+
This product includes software developed by Niels Lohmann
27+
* nlohmann-json: JSON for Modern C++
28+
* Copyright (c) 2013-2022 Niels Lohmann
29+
* https://github.com/nlohmann/json
30+
31+
This product includes software from the libcpr team and contributors
32+
* cpr: A modern C++ HTTP requests library
33+
* Copyright (c) 2017-2021 Huu Nguyen
34+
* Copyright (c) 2022 libcpr and many other contributors
35+
* https://github.com/libcpr/cpr
36+
37+
This product includes software developed by Daniel Stenberg and contributors
38+
* curl: A library for transferring data with URL syntax
39+
* Copyright (c) 1996 - 2025, Daniel Stenberg, and many contributors
40+
* https://curl.se/

cmake_modules/IcebergThirdpartyToolchain.cmake

Lines changed: 3 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -469,12 +469,6 @@ function(resolve_curl_dependency)
469469

470470
fetchcontent_makeavailable(CURL)
471471

472-
if(TARGET OpenSSL::SSL)
473-
# curl depends on the system's OpenSSL
474-
message(STATUS "Adding OpenSSL to the system dependency list.")
475-
list(APPEND ICEBERG_SYSTEM_DEPENDENCIES OpenSSL)
476-
endif()
477-
478472
if(curl_SOURCE_DIR)
479473
if(NOT TARGET CURL::libcurl)
480474
add_library(CURL::libcurl INTERFACE IMPORTED)
@@ -493,6 +487,9 @@ function(resolve_curl_dependency)
493487
ARCHIVE DESTINATION "${ICEBERG_INSTALL_LIBDIR}"
494488
LIBRARY DESTINATION "${ICEBERG_INSTALL_LIBDIR}")
495489
message(STATUS "Use vendored CURL")
490+
491+
# curl depends on the system's OpenSSL
492+
list(APPEND ICEBERG_SYSTEM_DEPENDENCIES OpenSSL)
496493
else()
497494
set(CURL_VENDORED FALSE)
498495
list(APPEND ICEBERG_SYSTEM_DEPENDENCIES CURL)

0 commit comments

Comments
 (0)