Min build requirements update

.ci/.drone.yml

@@ -37,7 +37,6 @@
 #    include:
 #      - refs/heads/main
 #      - refs/heads/develop
-#      - refs/heads/helics2
 #      - 'refs/pull/**'
 #      - 'refs/tags/**'
 #
@@ -80,6 +79,5 @@ trigger:
     include:
       - refs/heads/main
       - refs/heads/develop
-      - refs/heads/helics2
       - "refs/pull/**"
       - "refs/tags/**"

.ci/azure-pipelines.yml

@@ -12,22 +12,22 @@ jobs:
     strategy:
       matrix:
         ubuntuDefault:
-          containerImage: "helics/buildenv:ubuntu20.04-default-builder"
+          containerImage: "helics/buildenv:ubuntu22.04-default-builder"
           test_config: "ci"
           use_mpi: "true"
           encrypted: "true"
-        gcc8:
-          containerImage: "helics/buildenv:gcc8-builder"
+        gcc11:
+          containerImage: "helics/buildenv:gcc11-builder"
           test_config: "ci"
           use_mpi: "true"
           encrypted: "true"
-        clang13:
-          containerImage: "helics/buildenv:clang13-builder"
+        clang14:
+          containerImage: "helics/buildenv:clang14-builder"
           test_config: "ci"
           use_mpi: ""
           encrypted: ""
-        clang7:
-          containerImage: "helics/buildenv:clang7-builder"
+        clang18:
+          containerImage: "helics/buildenv:clang18-builder"
           test_config: "ci"
           use_mpi: ""
           encrypted: ""

.circleci/config.yml

@@ -138,7 +138,7 @@ jobs:
 
   helicsInstall1:
     docker:
-      - image: helics/buildenv:builder
+      - image: helics/buildenv:ubuntu24.04-default-builder
     environment:
       CMAKE_FLAGS: "-DHELICS_BUILD_CXX_SHARED_LIB=ON -DHELICS_BUILD_TESTS=ON -DHELICS_BUILD_BENCHMARKS=ON -DHELICS_INSTALL_PACKAGE_TESTS=ON"
     steps:
@@ -148,9 +148,9 @@ jobs:
 
   helicsNoZmq:
     docker:
-      - image: helics/buildenv:gcc10-builder
+      - image: helics/buildenv:gcc13-builder
     environment:
-      CMAKE_FLAGS: "-DHELICS_BUILD_CXX_SHARED_LIB=ON -DHELICS_ENABLE_ZMQ_CORE=OFF -DHELICS_ENABLE_IPC_CORE=OFF -DHELICS_BUILD_TESTS=ON -DCMAKE_CXX_STANDARD=17"
+      CMAKE_FLAGS: "-DHELICS_BUILD_CXX_SHARED_LIB=ON -DHELICS_ENABLE_ZMQ_CORE=OFF -DHELICS_ENABLE_IPC_CORE=OFF -DHELICS_BUILD_TESTS=ON -DCMAKE_CXX_STANDARD=20"
     steps:
       - checkout
       - run: *setup_helics
@@ -167,7 +167,7 @@ jobs:
 
   helicsInstall2:
     docker:
-      - image: helics/buildenv:builder
+      - image: helics/buildenv:ubuntu24.04-default-builder
     environment:
       CMAKE_FLAGS: "-DHELICS_BUILD_TESTS=ON -DHELICS_INSTALL_PACKAGE_TESTS=ON"
     steps:
@@ -206,7 +206,7 @@ jobs:
 
   benchmarkjob:
     docker:
-      - image: helics/buildenv:builder
+      - image: helics/buildenv:ubuntu24.04-default-builder
     environment:
       CMAKE_FLAGS: "-DHELICS_BUILD_BENCHMARKS=ON -DBM_RESULT_DIR=/tmp/bm_results/ -DHELICS_DISABLE_C_SHARED_LIB=ON"
     steps:

.cirrus.yml

@@ -7,7 +7,7 @@ task:
     pkg install -y cmake libzmq4 ninja git
   build_script: |
     mkdir build && cd build
-    cmake -GNinja -DHELICS_BUILD_TESTS=ON -DHELICS_BUILD_EXAMPLES=ON ..
+    cmake -GNinja -DHELICS_BUILD_TESTS=ON -DHELICS_BUILD_EXAMPLES=ON -DCMAKE_CXX_STANDARD=17 ..
     cmake --build .
   test_script: |
     cd build

.gitmodules

@@ -31,3 +31,12 @@
 	path = ThirdParty/networking
 	url = ../../GMLC-TDC/networking.git
 	branch = main
+[submodule "ThirdParty/libzmq"]
+	path = ThirdParty/libzmq
+	url = https://github.com/zeromq/libzmq.git
+[submodule "ThirdParty/googletest"]
+	path = ThirdParty/googletest
+	url = https://github.com/google/googletest.git
+[submodule "ThirdParty/benchmark"]
+	path = ThirdParty/benchmark
+	url = https://github.com/google/benchmark.git

CMakeLists.txt

@@ -7,7 +7,7 @@
 # SPDX-License-Identifier: BSD-3-Clause
 # ~~~
 
-cmake_minimum_required(VERSION 3.11...3.28)
+cmake_minimum_required(VERSION 3.22...3.30)
 
 # Install dependencies using vcpkg if VCPKG_ROOT is set and no CMake Toolchain file is given vcpkg
 # installation on a system doesn't set VCPKG_ROOT, so setting it should be like an opt-in for users
@@ -17,14 +17,15 @@ if(DEFINED ENV{VCPKG_ROOT} AND NOT DEFINED CMAKE_TOOLCHAIN_FILE AND NOT HELICS_D
     set(CMAKE_TOOLCHAIN_FILE "$ENV{VCPKG_ROOT}/scripts/buildsystems/vcpkg.cmake" CACHE STRING "")
 endif()
 
-project(HELICS VERSION 3.5.3)
+message(STATUS "Generating with CMAKE version ${CMAKE_VERSION}")
+project(HELICS VERSION 3.6.0)
 
 # -----------------------------------------------------------------------------
 # HELICS Version number
 # -----------------------------------------------------------------------------
 set(HELICS_VERSION_BUILD)
 # use ISO date YYYY-MM-DD
-set(HELICS_DATE "2024-07-08")
+set(HELICS_DATE "2024-10-08")
 
 set(HELICS_VERSION_UNDERSCORE
     "${HELICS_VERSION_MAJOR}_${HELICS_VERSION_MINOR}_${HELICS_VERSION_PATCH}"
@@ -82,17 +83,15 @@ include(CMakeDependentOption)
 include(copy_key_files)
 include(CTest)
 
-if(NOT CMAKE_VERSION VERSION_LESS 3.12)
-    option(
-        HELICS_ENABLE_PYTHON_BUILD_SCRIPTS
-        "HELICS build systems can use python to automatically generate some files.  This is not required but may be useful if you are a developer and frequently modifying some files"
-        OFF
-    )
-    mark_as_advanced(HELICS_ENABLE_PYTHON_BUILD_SCRIPTS)
+option(
+    HELICS_ENABLE_PYTHON_BUILD_SCRIPTS
+    "HELICS build systems can use python to automatically generate some files.  This is not required but may be useful if you are a developer and frequently modifying some files"
+    OFF
+)
+mark_as_advanced(HELICS_ENABLE_PYTHON_BUILD_SCRIPTS)
 
-    if(HELICS_ENABLE_PYTHON_BUILD_SCRIPTS)
-        find_package(Python COMPONENTS Interpreter)
-    endif()
+if(HELICS_ENABLE_PYTHON_BUILD_SCRIPTS)
+    find_package(Python COMPONENTS Interpreter)
 endif()
 
 # allow BOOST library inclusion to be turned off completely; this option will disable the IPC core
@@ -283,7 +282,25 @@ if(NOT HELICS_DISABLE_GIT_OPERATIONS)
     if(NOT EXISTS "${PROJECT_SOURCE_DIR}/ThirdParty/spdlog/CMakeLists.txt")
         submod_update(ThirdParty/spdlog)
     endif()
-    check_submodule_status()
+
+    set(IGNORE_MODULES libzmq)
+    if(HELICS_BUILD_TESTS)
+        if(NOT EXISTS "${PROJECT_SOURCE_DIR}/ThirdParty/googletest/CMakeLists.txt")
+            submod_update(ThirdParty/googletest)
+        endif()
+    else()
+        list(APPEND IGNORE_MODULES googletest)
+    endif()
+
+    if(HELICS_BUILD_BENCHMARKS)
+        if(NOT EXISTS "${PROJECT_SOURCE_DIR}/ThirdParty/benchmark/CMakeLists.txt")
+            submod_update(ThirdParty/benchmark)
+        endif()
+    else()
+        list(APPEND IGNORE_MODULES benchmark)
+    endif()
+
+    check_submodule_status(IGNORE_MODULES)
 
 endif() # NOT HELICS_DISABLE_GIT_OPERATIONS
 include(GNUInstallDirs)
@@ -405,10 +422,12 @@ if(MSYS OR CYGWIN)
         set(ENABLE_IPC_CORE FALSE)
     endif()
     # setting to windows 10 for all compilation
-    if(WIN32_WINNT)
-        add_compile_definitions("_WIN32_WINNT=${WIN32_WINNT}")
-    else()
-        add_compile_definitions(_WIN32_WINNT=0x0A00)
+    if(NOT HELICS_SKIP_WINNT_DEFINITION)
+        if(WIN32_WINNT)
+            add_compile_definitions("_WIN32_WINNT=${WIN32_WINNT}")
+        else()
+            add_compile_definitions(_WIN32_WINNT=0x0A00)
+        endif()
     endif()
 endif()
 
@@ -690,17 +709,17 @@ set(LICENSE_LIST
 )
 
 if(HELICS_BUILD_TESTS)
-    list(APPEND LICENSE_LIST "Google Test" "${PROJECT_BINARY_DIR}/_deps/googletest-src/LICENSE")
+    list(APPEND LICENSE_LIST "Google Test" "${PROJECT_SOURCE_DIR}/ThirdParty/googletest/LICENSE")
 endif()
 
 if(HELICS_BUILD_BENCHMARKS)
     list(APPEND LICENSE_LIST "Google Benchmark"
-         "${PROJECT_BINARY_DIR}/_deps/gbenchmark-src/LICENSE"
+         "${PROJECT_SOURCE_DIR}/ThirdParty/benchmark/LICENSE"
     )
 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/LICENSE")
+    list(APPEND LICENSE_LIST "ZeroMQ" "${PROJECT_SOURCE_DIR}/ThirdParty/libzmq/LICENSE")
 endif()
 
 if(NOT HELICS_DISABLE_ASIO)
@@ -786,16 +805,6 @@ cmake_dependent_option(
 
 if(HELICS_ENABLE_PACKAGE_BUILD)
 
-    if(CMAKE_VERSION VERSION_LESS 3.13)
-        if(HELICS_ZMQ_SUBPROJECT OR HELICS_ZMQ_FORCE_SUBPROJECT)
-            if(ENABLE_ZMQ_CORE)
-                message(
-                    FATAL_ERROR
-                        "CMAKE 3.13 or higher is required to package a subproject of ZeroMQ with HELICS"
-                )
-            endif()
-        endif()
-    endif()
     # cmake-format: off
     set(CPACK_PACKAGE_NAME "Helics")
     set(CPACK_PACKAGE_VENDOR "GMLC")
@@ -880,6 +889,8 @@ if(HELICS_ENABLE_PACKAGE_BUILD)
         "Helics Recorder"
         "helics_player"
         "Helics Player"
+        "helics_connector"
+        "Helics Connector"
     )
 
     if(INSTALL_SYSTEM_LIBRARIES)

appveyor.yml

@@ -5,9 +5,9 @@ branches:
     - main
     - develop
 
-version: 3.5.3.{build}
+version: 3.6.0.{build}
 
-image: Visual Studio 2019
+image: Visual Studio 2022
 
 environment:
   global:
@@ -19,6 +19,10 @@ environment:
 cache:
   - '%CYG_CACHE%'
 
+init:
+  ps: |
+    (New-Object Net.WebClient).DownloadFile('https://cygwin.com/setup-x86_64.exe', 'C:\cygwin64\setup-x86_64.exe')
+
 #
 # Install needed build dependencies
 #
@@ -33,7 +37,7 @@ before_build:
   - mkdir build
   - cd build
   - git config --global --add safe.directory /cygdrive/c/projects/helics
-  - '%CYG_BASH% -lc "cd $APPVEYOR_BUILD_FOLDER/build && cmake ..  -DCMAKE_BUILD_TYPE=Release -DHELICS_ENABLE_SWIG=OFF -DHELICS_BUILD_TESTS=OFF -DHELICS_DISABLE_ASIO=ON -DHELICS_ENABLE_IPC_CORE=OFF"'
+  - '%CYG_BASH% -lc "cd $APPVEYOR_BUILD_FOLDER/build && cmake ..  -DCMAKE_BUILD_TYPE=Release -DHELICS_SKIP_WINNT_DEFINITION=ON -DCMAKE_CXX_STANDARD=17 -DHELICS_ENABLE_SWIG=OFF -DHELICS_DISABLE_GIT_OPERATIONS=ON -DHELICS_BUILD_TESTS=OFF -DHELICS_DISABLE_ASIO=ON -DHELICS_ENABLE_IPC_CORE=OFF"'
   - cd ..
 
 # Build and test, actually.

benchmarks/CMakeLists.txt

@@ -12,7 +12,7 @@ if(hasParent)
     include(AddGooglebenchmark)
     add_subdirectory(helics)
 else()
-    cmake_minimum_required(VERSION 3.11...3.25)
+    cmake_minimum_required(VERSION 3.22...3.30)
     set(HELICS_BUILD_TESTS OFF CACHE INTERNAL "")
     set(HELICS_BUILD_JAVA_INTERFACE OFF CACHE INTERNAL "")
     set(HELICS_BUILD_CSHARP_INTERFACE OFF CACHE INTERNAL "")

config/cmake/AddGooglebenchmark.cmake

@@ -7,60 +7,21 @@
 # SPDX-License-Identifier: BSD-3-Clause
 # ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
 
-set(gbenchmark_version v1.8.3)
-
-string(TOLOWER "gbenchmark" gbName)
-
-if(NOT CMAKE_VERSION VERSION_LESS 3.11)
-    include(FetchContent)
-
-    fetchcontent_declare(
-        gbenchmark GIT_REPOSITORY https://github.com/google/benchmark.git
-        GIT_TAG ${gbenchmark_version}
-    )
-
-    fetchcontent_getproperties(gbenchmark)
-
-    if(NOT ${gbName}_POPULATED)
-        # Fetch the content using previously declared details
-        fetchcontent_populate(gbenchmark)
-
-    endif()
-
-    hide_variable(FETCHCONTENT_SOURCE_DIR_GBENCHMARK)
-    hide_variable(FETCHCONTENT_UPDATES_DISCONNECTED_GBENCHMARK)
-
-else() # cmake <3.11
-
-    # create the directory first
-    file(MAKE_DIRECTORY ${PROJECT_BINARY_DIR}/_deps)
-
-    include(GitUtils)
-    git_clone(
-        PROJECT_NAME
-        gbenchmark
-        GIT_URL
-        https://github.com/google/benchmark.git
-        GIT_TAG
-        ${gbenchmark_version}
-        DIRECTORY
-        ${PROJECT_BINARY_DIR}/_deps
-    )
-
-    set(${gbName}_BINARY_DIR ${PROJECT_BINARY_DIR}/_deps/${gbName}-build)
-
-endif()
-
 set(BENCHMARK_ENABLE_GTEST_TESTS OFF CACHE INTERNAL "")
 set(BENCHMARK_ENABLE_TESTING OFF CACHE INTERNAL "Suppressing benchmark's tests")
 set(BENCHMARK_ENABLE_INSTALL OFF CACHE INTERNAL "")
 set(BENCHMARK_DOWNLOAD_DEPENDENCIES ON CACHE INTERNAL "")
 set(BENCHMARK_ENABLE_ASSEMBLY_TESTS OFF CACHE INTERNAL "")
+set(BENCHMARK_INSTALL_DOCS OFF CACHE INTERNAL "")
 # tell google benchmarks to use std regex since we only compile on compilers with std regex
 set(HAVE_STD_REGEX ON CACHE INTERNAL "")
 set(HAVE_POSIX_REGEX OFF CACHE INTERNAL "")
 set(HAVE_GNU_POSIX_REGEX OFF CACHE INTERNAL "")
-add_subdirectory(${${gbName}_SOURCE_DIR} ${${gbName}_BINARY_DIR} EXCLUDE_FROM_ALL)
+
+add_subdirectory(
+    ${CMAKE_SOURCE_DIR}/ThirdParty/benchmark ${CMAKE_BINARY_DIR}/ThirdParty/benchmarks
+    EXCLUDE_FROM_ALL
+)
 
 # Target must already exist
 macro(add_benchmark_with_main TESTNAME)
@@ -92,6 +53,7 @@ hide_variable(BENCHMARK_ENABLE_LIBPFM)
 hide_variable(BENCHMARK_ENABLE_WERROR)
 hide_variable(BENCHMARK_FORCE_WERROR)
 hide_variable(BENCHMARK_USE_BUNDLED_GTEST)
+hide_variable(CXXFEATURECHECK_DEBUG)
 hide_variable(LIBRT)
 
 set_target_properties(benchmark benchmark_main PROPERTIES FOLDER "Extern")