Skip to content

Commit

Permalink
Update the autobuild zmq to 4.3.5 (#2582)
Browse files Browse the repository at this point in the history
* Update the autobuild zmq to 4.3.5

* [pre-commit.ci] auto fixes from pre-commit.com hooks

for more information, see https://pre-commit.ci

---------

Co-authored-by: pre-commit-ci[bot] <66853113+pre-commit-ci[bot]@users.noreply.github.com>
  • Loading branch information
phlptp and pre-commit-ci[bot] authored Jan 2, 2024
1 parent 974314d commit 7b503fc
Show file tree
Hide file tree
Showing 7 changed files with 18 additions and 17 deletions.
2 changes: 1 addition & 1 deletion CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -706,7 +706,7 @@ if(HELICS_BUILD_BENCHMARKS)
endif()

if(EXISTS ${PROJECT_BINARY_DIR}/_deps/libzmq-src AND HELICS_ENABLE_ZMQ_CORE)
list(APPEND LICENSE_LIST "ZeroMQ" "${PROJECT_BINARY_DIR}/_deps/libzmq-src/COPYING")
list(APPEND LICENSE_LIST "ZeroMQ" "${PROJECT_BINARY_DIR}/_deps/libzmq-src/LICENSE")
endif()

if(NOT HELICS_DISABLE_ASIO)
Expand Down
6 changes: 3 additions & 3 deletions CONTRIBUTORS.md
Original file line number Diff line number Diff line change
Expand Up @@ -32,7 +32,6 @@ If you would like to contribute to the HELICS project see [CONTRIBUTING](CONTRIB
- [Ai Enkoji](https://github.com/aenkoji1)
- [Nan Duan](https://github.com/nan-duan)
- [Nathan Yee](https://github.com/yee29) (Now Accenture)
- [Ai Enkoji](https://github.com/aenkoji1)

### National Renewable Energy Lab

Expand Down Expand Up @@ -76,7 +75,7 @@ CLI11 is a command line parser used throughout HELICS. Several modification used

### [toml11](https://github.com/ToruNiina/toml11)

toml11 is a C\++11 header-only TOML parser/encoder depending only on the C++ standard library. Compatible with the latest version of TOML v0.5.0. toml11 is licensed under the [MIT](https://github.com/ToruNiina/toml11/blob/master/LICENSE) license. HELICS includes it through a submodule of a library [fork](https://github.com/GMLC-TDC/toml11) until the changes can be merged upstream.
toml11 is a C\++11 header-only TOML parser/encoder depending only on the C++ standard library. Compatible with the latest version of TOML v1.0.0. toml11 is licensed under the [MIT](https://github.com/ToruNiina/toml11/blob/master/LICENSE) license. HELICS includes it through a submodule of a library [fork](https://github.com/GMLC-TDC/toml11) until the changes can be merged upstream.

### [GridDyn](https://github.com/LLNL/GridDyn)

Expand Down Expand Up @@ -139,7 +138,8 @@ Boost is used in a few places in the code. The IPC core uses the Boost.Interproc

#### [zmq](http://www.zeromq.org)

ZeroMQ is one of many backends that can be used by HELICS for message passing (ZMQ core networking). The automatic download currently uses version 4.3.1. No ZMQ library code is included in the HELICS source. HELICS installers include ZeroMQ binary libraries. ZeroMQ is licensed under [LGPL](https://github.com/zeromq/libzmq/blob/master/COPYING.LESSER) with a modification to allow for linking and in various forms and distribution of the binary under different terms if the library was not modified. Clarification on static linking being okay can be found in [this github issue](https://github.com/zeromq/libzmq/issues/3787). No modification of the ZMQ library or any of the ZeroMQ source files is included in the HELICS source code. Currently the Windows installers and shared library builds static link ZeroMQ. When building from source it is an optional component and can be excluded by setting `HELICS_ENABLE_ZMQ_CORE` to `OFF`
ZeroMQ is one of many backends that can be used by HELICS for message passing (ZMQ core networking). The automatic download currently uses version 4.3.5. No ZMQ library code is included in the HELICS source. HELICS installers include ZeroMQ binary libraries. ZeroMQ is licensed under [MPL](https://github.com/zeromq/libzmq/blob/master/LICENSE)
Previous versions(prior to 4.3.5) were under LGPL with a modification to allow for linking and in various forms and distribution of the binary under different terms if the library was not modified. Clarification on static linking being okay can be found in [this github issue](https://github.com/zeromq/libzmq/issues/3787). No modification of the ZMQ library or any of the ZeroMQ source files is included in the HELICS source code. Currently the Windows installers and shared library builds static link ZeroMQ. When building from source it is an optional component and can be excluded by setting `HELICS_ENABLE_ZMQ_CORE` to `OFF`

### [Google Test](https://github.com/google/googletest)

Expand Down
7 changes: 6 additions & 1 deletion config/cmake/AddGooglebenchmark.cmake
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
# ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
# Copyright (c) 2017-2020, Battelle Memorial Institute; Lawrence Livermore
# Copyright (c) 2017-2024, Battelle Memorial Institute; Lawrence Livermore
# National Security, LLC; Alliance for Sustainable Energy, LLC.
# See the top-level NOTICE for additional details.
# All rights reserved.
Expand Down Expand Up @@ -87,6 +87,11 @@ hide_variable(BENCHMARK_ENABLE_ASSEMBLY_TESTS)
hide_variable(BENCHMARK_ENABLE_EXCEPTIONS)
hide_variable(BENCHMARK_ENABLE_LTO)
hide_variable(BENCHMARK_USE_LIBCXX)
hide_variable(BENCHMARK_ENABLE_DOXYGEN)
hide_variable(BENCHMARK_ENABLE_LIBPFM)
hide_variable(BENCHMARK_ENABLE_WERROR)
hide_variable(BENCHMARK_FORCE_WERROR)
hide_variable(BENCHMARK_USE_BUNDLED_GTEST)
hide_variable(LIBRT)

set_target_properties(benchmark benchmark_main PROPERTIES FOLDER "Extern")
Expand Down
10 changes: 2 additions & 8 deletions config/cmake/FindZeroMQ.cmake
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
# ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
# Copyright (c) 2017-2020, Battelle Memorial Institute; Lawrence Livermore
# Copyright (c) 2017-2024, Battelle Memorial Institute; Lawrence Livermore
# National Security, LLC; Alliance for Sustainable Energy, LLC.
# See the top-level NOTICE for additional details.
# All rights reserved.
Expand Down Expand Up @@ -60,6 +60,7 @@ if(MSVC)

if(${ZeroMQ_NAME} MATCHES "registry") # if key was not found, the string "registry" is returned
set(_ZeroMQ_VERSIONS
"4_3_5"
"4_3_4"
"4_3_3"
"4_3_2"
Expand All @@ -71,13 +72,6 @@ if(MSVC)
"4_2_2"
"4_2_1"
"4_2_0"
"4_1_5"
"4_1_4"
"4_0_4"
"4_0_3"
"4_0_2"
"4_0_1"
"4_0_0"
)
set(ZeroMQ_LIBRARY_NAME)
foreach(ver ${_ZeroMQ_VERSIONS})
Expand Down
6 changes: 4 additions & 2 deletions config/cmake/addlibzmq.cmake
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
# ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
# Copyright (c) 2019-2023, Battelle Memorial Institute; Lawrence Livermore
# Copyright (c) 2019-2024, Battelle Memorial Institute; Lawrence Livermore
# National Security, LLC; Alliance for Sustainable Energy, LLC.
# See the top-level NOTICE for additional details.
# All rights reserved.
Expand All @@ -19,7 +19,7 @@ else()
set(zmq_shared_build ON)
endif()

set(${PROJECT_NAME}_LIBZMQ_VERSION v4.3.4)
set(${PROJECT_NAME}_LIBZMQ_VERSION v4.3.5)

string(TOLOWER "libzmq" lcName)

Expand Down Expand Up @@ -120,6 +120,8 @@ hide_variable(ENABLE_ANALYSIS)
hide_variable(ENABLE_ASAN)
hide_variable(ENABLE_RADIX_TREE)
hide_variable(ENABLE_EVENTFD)
hide_variable(ENABLE_LIBSODIUM_RANDOMBYTES_CLOSE)
hide_variable(ENABLE_NO_EXPORT)
hide_variable(ZMQ_CV_IMPL)
hide_variable(BUILD_TESTS)
hide_variable(ENABLE_INTRINSICS)
Expand Down
2 changes: 1 addition & 1 deletion config/cmake/combineLicenses.cmake
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
# ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
# Copyright (c) 2017-2021, Battelle Memorial Institute; Lawrence Livermore
# Copyright (c) 2017-2024, Battelle Memorial Institute; Lawrence Livermore
# National Security, LLC; Alliance for Sustainable Energy, LLC.
# See the top-level NOTICE for additional details.
# All rights reserved.
Expand Down
2 changes: 1 addition & 1 deletion docs/user-guide/installation/build_from_source.md
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,7 @@ git checkout develop
To switch to a tagged release, you can type the following:

```bash
git checkout v3.0.1
git checkout v3.3.1
```

You will not need a full understanding of how `git` works for installing HELICS, but if you are interested you can find a good `git` resource in [this page](https://git-scm.com/book/en/v2).
Expand Down

0 comments on commit 7b503fc

Please sign in to comment.