[Build] Remove deprecated builtin_zeromq and builtin_cppzmq options

.github/workflows/root-ci-config/buildconfig/global.txt

@@ -6,7 +6,6 @@ asserts=OFF
 builtin_cfitsio=OFF
 builtin_clang=ON
 builtin_cling=ON
-builtin_cppzmq=OFF
 builtin_fftw3=OFF
 builtin_freetype=OFF
 builtin_ftgl=OFF
@@ -24,7 +23,6 @@ builtin_unuran=OFF
 builtin_vdt=OFF
 builtin_xrootd=OFF
 builtin_xxhash=OFF
-builtin_zeromq=OFF
 builtin_zlib=OFF
 builtin_zstd=OFF
 ccache=ON

README/ReleaseNotes/v642/index.md

@@ -42,6 +42,7 @@ The following people have contributed to this new version:
 * The method `RooRealVar::removeRange()` and the corresponding method in `RooErrorVar` that were deprecated in ROOT 6.40 are now removed.
 * The overloads of `RooAbsReal::createChi2()` and `RooAbsReal::chi2FitTo()` that take unbinned **RooDataSet** data objects were deprecated in ROOT 6.40 and are now removed.
 * The **RooStats::HybridPlot** class and the related **HybridResult::GetPlot** method were deprecated in ROOT 6.40 and are now removed.
+* The `builtin_zeromq` and `builtin_cppzmq` build options that were deprecated in ROOT 6.40 are now removed.
 
 ## Python Interface
 

cmake/modules/RootBuildOptions.cmake

@@ -86,7 +86,6 @@ ROOT_BUILD_OPTION(builtin_clang ON "Build bundled copy of Clang")
 ROOT_BUILD_OPTION(builtin_cling ON "Build bundled copy of Cling. Only build with an external cling if you know what you are doing: associating ROOT commits with cling commits is tricky.")
 MARK_AS_ADVANCED(builtin_cling)
 ROOT_BUILD_OPTION(builtin_civetweb ON "Use civetweb distributed with ROOT")
-ROOT_BUILD_OPTION(builtin_cppzmq OFF "Use ZeroMQ C++ bindings installed by ROOT (requires network)")
 ROOT_BUILD_OPTION(builtin_fftw3 OFF "Build FFTW3 internally (requires network) [GPL]")
 ROOT_BUILD_OPTION(builtin_freetype OFF "Build bundled copy of freetype")
 ROOT_BUILD_OPTION(builtin_ftgl OFF "Build bundled copy of FTGL")
@@ -108,7 +107,6 @@ ROOT_BUILD_OPTION(builtin_unuran OFF "Build bundled copy of unuran [GPL]")
 ROOT_BUILD_OPTION(builtin_vdt OFF "Build VDT internally (requires network)")
 ROOT_BUILD_OPTION(builtin_xrootd OFF "Build XRootD internally (requires network)")
 ROOT_BUILD_OPTION(builtin_xxhash OFF "Build bundled copy of xxHash")
-ROOT_BUILD_OPTION(builtin_zeromq OFF "Build ZeroMQ internally (requires network)")
 ROOT_BUILD_OPTION(builtin_zlib OFF "Build bundled copy of zlib")
 ROOT_BUILD_OPTION(builtin_zstd OFF "Build included libzstd, or use system libzstd")
 ROOT_BUILD_OPTION(ccache OFF "Enable ccache usage for speeding up builds")
@@ -256,7 +254,6 @@ if(builtin_all)
   set(builtin_civetweb_defvalue ON)
   set(builtin_clang_defvalue ON)
   set(builtin_cling_defvalue ON)
-  set(builtin_cppzmq_defvalue ON)
 #  set(builtin_fftw3_defvalue ON) (GPL)
   set(builtin_freetype_defvalue ON)
   set(builtin_ftgl_defvalue ON)
@@ -280,7 +277,6 @@ if(builtin_all)
   set(builtin_vdt_defvalue ON)
   set(builtin_xrootd_defvalue ON)
   set(builtin_xxhash_defvalue ON)
-  set(builtin_zeromq_defvalue ON)
   set(builtin_zlib_defvalue ON)
   set(builtin_zstd_defvalue ON)
 endif()
@@ -376,14 +372,14 @@ foreach(opt afdsmgrd afs alien bonjour builtin_afterimage builtin_davix castor c
         geocad gfal glite globus gsl_shared hdfs html ios jemalloc krb5
         ldap memstat minuit2 monalisa oracle proof pyroot-python2 pyroot_legacy
         pythia6 pythia6_nolink python qt qtgsi qt5web rfio ruby sapdb srp table
-        tcmalloc vmc xproofd mysql odbc pgsql)
+        tcmalloc vmc xproofd mysql odbc pgsql builtin_cppzmq builtin_zeromq)
   if(${opt})
     message(FATAL_ERROR ">>> '${opt}' is no longer part of ROOT ${ROOT_VERSION} build options.")
   endif()
 endforeach()
 
 #---Deprecated options------------------------------------------------------------------------
-foreach(opt builtin_cppzmq builtin_zeromq)
+foreach(opt )
   if(${opt})
     message(DEPRECATION ">>> Option '${opt}' is deprecated and will be removed in the next release of ROOT. Please contact root-dev@cern.ch should you still need it.")
   endif()

cmake/modules/SearchInstalledSoftware.cmake

@@ -1404,82 +1404,22 @@ endif()
 #---Check for ZeroMQ when building RooFit::MultiProcess--------------------------------------------
 
 if (roofit_multiprocess)
-  if(NOT builtin_zeromq)
     message(STATUS "Looking for ZeroMQ (libzmq)")
-    # Clear cache before calling find_package(ZeroMQ),
-    # necessary to be able to toggle builtin_zeromq and
-    # not have find_package(ZeroMQ) find builtin ZeroMQ.
-    foreach(suffix FOUND INCLUDE_DIR INCLUDE_DIRS LIBRARY LIBRARIES)
-      unset(ZeroMQ_${suffix} CACHE)
-    endforeach()
 
     # Temporarily prefer config mode over module mode, so that a CMake-installed system version
     # gets detected before looking for an autotools-installed system version (which the
     # FindZeroMQ.cmake module does).
     set(CMAKE_FIND_PACKAGE_PREFER_CONFIG_ORIGINAL_VALUE ${CMAKE_FIND_PACKAGE_PREFER_CONFIG})
     set(CMAKE_FIND_PACKAGE_PREFER_CONFIG TRUE)
 
-    if(fail-on-missing)
-      find_package(ZeroMQ 4.3.5 REQUIRED)
-    else()
-      find_package(ZeroMQ 4.3.5)
-      if(NOT ZeroMQ_FOUND)
-        message(STATUS "ZeroMQ not found. Switching on builtin_zeromq option")
-        set(builtin_zeromq ON CACHE BOOL "Enabled because ZeroMQ not found (${builtin_zeromq_description})" FORCE)
-        # If the ZeroMQ system version is too old, we can't use the system C++
-        # headers either (note that find_package(ZeroMQ) not only checks if the
-        # library exists, but also if it's a recent version with zmq_ppoll).
-        set(builtin_cppzmq ON CACHE BOOL "Enabled because ZeroMQ not found (${builtin_cppzmq_description})" FORCE)
-      endif()
-    endif()
+    find_package(ZeroMQ 4.3.5 REQUIRED)
 
     # Reset default find_package mode
     set(CMAKE_FIND_PACKAGE_PREFER_CONFIG ${CMAKE_FIND_PACKAGE_PREFER_CONFIG_ORIGINAL_VALUE})
     unset(CMAKE_FIND_PACKAGE_PREFER_CONFIG_ORIGINAL_VALUE)
-  endif()
-
-  if(builtin_zeromq)
-    ROOT_CHECK_CONNECTION("builtin_zeromq=OFF")
-    if(NO_CONNECTION)
-      message(STATUS "No internet connection, disabling the `builtin_zeromq` and `roofit_multiprocess` options")
-      set(builtin_zeromq OFF CACHE BOOL "Disabled because there is no internet connection" FORCE)
-      set(roofit_multiprocess OFF CACHE BOOL "Disabled because there is no internet connection" FORCE)
-    else()
-      list(APPEND ROOT_BUILTINS ZeroMQ)
-      add_subdirectory(builtins/zeromq/libzmq)
-    endif()
-  endif()
 
-  if(NOT builtin_cppzmq)
     message(STATUS "Looking for ZeroMQ C++ bindings (cppzmq)")
-    # Clear cache before calling find_package(cppzmq),
-    # necessary to be able to toggle builtin_cppzmq and
-    # not have find_package(cppzmq) find builtin cppzmq.
-    foreach(suffix FOUND INCLUDE_DIR INCLUDE_DIRS)
-      unset(cppzmq_${suffix} CACHE)
-    endforeach()
-    if(fail-on-missing)
-      find_package(cppzmq REQUIRED)
-    else()
-      find_package(cppzmq QUIET)
-      if(NOT cppzmq_FOUND)
-        message(STATUS "ZeroMQ C++ bindings not found. Switching on builtin_cppzmq option")
-        set(builtin_cppzmq ON CACHE BOOL "Enabled because ZeroMQ C++ bindings not found (${builtin_cppzmq_description})" FORCE)
-      endif()
-    endif()
-  endif()
-
-  if(builtin_cppzmq)
-    ROOT_CHECK_CONNECTION("builtin_cppzmq=OFF")
-    if(NO_CONNECTION)
-      message(STATUS "No internet connection, disabling the `builtin_cppzmq` and `roofit_multiprocess` options")
-      set(builtin_cppzmq OFF CACHE BOOL "Disabled because there is no internet connection" FORCE)
-      set(roofit_multiprocess OFF CACHE BOOL "Disabled because there is no internet connection" FORCE)
-    else()
-      list(APPEND ROOT_BUILTINS cppzmq)
-      add_subdirectory(builtins/zeromq/cppzmq)
-    endif()
-  endif()
+    find_package(cppzmq REQUIRED)
 endif (roofit_multiprocess)
 
 #---Check for googletest---------------------------------------------------------------