Problem: Out of sync with zproject

Solution: Re-generate!

CMakeLists.txt

@@ -127,35 +127,35 @@ set(OPTIONAL_LIBRARIES_STATIC)
 # LIBZMQ dependency
 ########################################################################
 find_package(libzmq REQUIRED)
-IF (LIBZMQ_FOUND)
-    include_directories(${LIBZMQ_INCLUDE_DIRS})
-    list(APPEND MORE_LIBRARIES ${LIBZMQ_LIBRARIES})
+IF (libzmq_FOUND)
+    include_directories(${libzmq_INCLUDE_DIRS})
+    list(APPEND MORE_LIBRARIES ${libzmq_LIBRARIES})
   IF (PC_LIBZMQ_FOUND)
       set(pkg_config_names_private "${pkg_config_names_private} libzmq")
       list(APPEND OPTIONAL_LIBRARIES_STATIC ${PC_LIBZMQ_STATIC_LDFLAGS})
   ELSE (PC_LIBZMQ_FOUND)
       set(pkg_config_libs_private "${pkg_config_libs_private} -lzmq")
   ENDIF (PC_LIBZMQ_FOUND)
-ELSE (LIBZMQ_FOUND)
+ELSE (libzmq_FOUND)
     message( FATAL_ERROR "libzmq not found." )
-ENDIF (LIBZMQ_FOUND)
+ENDIF (libzmq_FOUND)
 
 ########################################################################
 # CZMQ dependency
 ########################################################################
 find_package(czmq REQUIRED)
-IF (CZMQ_FOUND)
-    include_directories(${CZMQ_INCLUDE_DIRS})
-    list(APPEND MORE_LIBRARIES ${CZMQ_LIBRARIES})
+IF (czmq_FOUND)
+    include_directories(${czmq_INCLUDE_DIRS})
+    list(APPEND MORE_LIBRARIES ${czmq_LIBRARIES})
   IF (PC_CZMQ_FOUND)
       set(pkg_config_names_private "${pkg_config_names_private} libczmq")
       list(APPEND OPTIONAL_LIBRARIES_STATIC ${PC_CZMQ_STATIC_LDFLAGS})
   ELSE (PC_CZMQ_FOUND)
       set(pkg_config_libs_private "${pkg_config_libs_private} -lczmq")
   ENDIF (PC_CZMQ_FOUND)
-ELSE (CZMQ_FOUND)
+ELSE (czmq_FOUND)
     message( FATAL_ERROR "czmq not found." )
-ENDIF (CZMQ_FOUND)
+ENDIF (czmq_FOUND)
 
 ########################################################################
 # version

Findczmq.cmake

@@ -4,7 +4,7 @@
 ################################################################################
 
 if (NOT MSVC)
-    include(FindPkgConfig)
+    find_package(PkgConfig)
     pkg_check_modules(PC_CZMQ "libczmq")
     if (PC_CZMQ_FOUND)
         # add CFLAGS from pkg-config file, e.g. draft api.
@@ -18,26 +18,26 @@ if (NOT MSVC)
 endif (NOT MSVC)
 
 find_path (
-    CZMQ_INCLUDE_DIRS
+    ${CMAKE_FIND_PACKAGE_NAME}_INCLUDE_DIRS
     NAMES czmq.h
     HINTS ${PC_CZMQ_INCLUDE_HINTS}
 )
 
 find_library (
-    CZMQ_LIBRARIES
+    ${CMAKE_FIND_PACKAGE_NAME}_LIBRARIES
     NAMES libczmq czmq
     HINTS ${PC_CZMQ_LIBRARY_HINTS}
 )
 
 include(FindPackageHandleStandardArgs)
 
 find_package_handle_standard_args(
-    CZMQ
-    REQUIRED_VARS CZMQ_LIBRARIES CZMQ_INCLUDE_DIRS
+    ${CMAKE_FIND_PACKAGE_NAME}
+    REQUIRED_VARS ${CMAKE_FIND_PACKAGE_NAME}_LIBRARIES ${CMAKE_FIND_PACKAGE_NAME}_INCLUDE_DIRS
 )
 mark_as_advanced(
-    CZMQ_FOUND
-    CZMQ_LIBRARIES CZMQ_INCLUDE_DIRS
+    ${CMAKE_FIND_PACKAGE_NAME}_FOUND
+    ${CMAKE_FIND_PACKAGE_NAME}_LIBRARIES ${CMAKE_FIND_PACKAGE_NAME}_INCLUDE_DIRS
 )
 
 ################################################################################

Findlibzmq.cmake

@@ -4,7 +4,7 @@
 ################################################################################
 
 if (NOT MSVC)
-    include(FindPkgConfig)
+    find_package(PkgConfig)
     pkg_check_modules(PC_LIBZMQ "libzmq")
     if (PC_LIBZMQ_FOUND)
         # add CFLAGS from pkg-config file, e.g. draft api.
@@ -18,7 +18,7 @@ if (NOT MSVC)
 endif (NOT MSVC)
 
 find_path (
-    LIBZMQ_INCLUDE_DIRS
+    ${CMAKE_FIND_PACKAGE_NAME}_INCLUDE_DIRS
     NAMES zmq.h
     HINTS ${PC_LIBZMQ_INCLUDE_HINTS}
 )
@@ -34,7 +34,7 @@ if (MSVC)
     endif ()
 
     # Retrieve ZeroMQ version number from zmq.h
-    file(STRINGS "${LIBZMQ_INCLUDE_DIRS}/zmq.h" zmq_version_defines
+    file(STRINGS "${${CMAKE_FIND_PACKAGE_NAME}_INCLUDE_DIRS}/zmq.h" zmq_version_defines
         REGEX "#define ZMQ_VERSION_(MAJOR|MINOR|PATCH)")
     foreach(ver ${zmq_version_defines})
         if(ver MATCHES "#define ZMQ_VERSION_(MAJOR|MINOR|PATCH) +([^ ]+)$")
@@ -58,21 +58,21 @@ if (MSVC)
         "libzmq-mt-s-${_zmq_version}" # Release|RelWithDebInfo|MinSizeRel, BUILD_STATIC
     )
 
-    find_library (LIBZMQ_LIBRARY_DEBUG
+    find_library (${CMAKE_FIND_PACKAGE_NAME}_LIBRARY_DEBUG
         NAMES ${_zmq_debug_names}
     )
 
-    find_library (LIBZMQ_LIBRARY_RELEASE
+    find_library (${CMAKE_FIND_PACKAGE_NAME}_LIBRARY_RELEASE
         NAMES ${_zmq_release_names}
     )
 
     include(SelectLibraryConfigurations)
-    select_library_configurations(LIBZMQ)
+    select_library_configurations(${CMAKE_FIND_PACKAGE_NAME})
 endif ()
 
-if (NOT LIBZMQ_LIBRARIES)
+if (NOT ${CMAKE_FIND_PACKAGE_NAME}_LIBRARIES)
     find_library (
-        LIBZMQ_LIBRARIES
+        ${CMAKE_FIND_PACKAGE_NAME}_LIBRARIES
         NAMES libzmq zmq
         HINTS ${PC_LIBZMQ_LIBRARY_HINTS}
     )
@@ -81,12 +81,12 @@ endif ()
 include(FindPackageHandleStandardArgs)
 
 find_package_handle_standard_args(
-    LIBZMQ
-    REQUIRED_VARS LIBZMQ_LIBRARIES LIBZMQ_INCLUDE_DIRS
+    ${CMAKE_FIND_PACKAGE_NAME}
+    REQUIRED_VARS ${CMAKE_FIND_PACKAGE_NAME}_LIBRARIES ${CMAKE_FIND_PACKAGE_NAME}_INCLUDE_DIRS
 )
 mark_as_advanced(
-    LIBZMQ_FOUND
-    LIBZMQ_LIBRARIES LIBZMQ_INCLUDE_DIRS
+    ${CMAKE_FIND_PACKAGE_NAME}_FOUND
+    ${CMAKE_FIND_PACKAGE_NAME}_LIBRARIES ${CMAKE_FIND_PACKAGE_NAME}_INCLUDE_DIRS
 )
 
 ################################################################################

bindings/jni/build.gradle

@@ -8,12 +8,12 @@
 plugins {
     id 'java'
     id 'maven-publish'
-    id 'com.jfrog.artifactory' version '4.9.9'
-    id 'com.jfrog.bintray' version '1.8.4'
-    id 'com.google.osdetector' version '1.6.2'
+    id 'com.jfrog.artifactory' version '4.21.0'
+    id 'com.jfrog.bintray' version '1.8.5'
+    id 'com.google.osdetector' version '1.7.0'
 }
 
-wrapper.gradleVersion = '6.5.1'
+wrapper.gradleVersion = '7.0.2'
 
 subprojects {
     apply plugin: 'java'

bindings/jni/ci_build.sh

@@ -134,7 +134,7 @@ TERM=dumb $CI_TIME ./gradlew clean
 
 if [ "$TRAVIS_OS_NAME" == "linux" ] && [ "$BINDING_OPTS" == "android" ]; then
     pushd ../../builds/android
-        export NDK_VERSION=android-ndk-r21d
+        export NDK_VERSION=android-ndk-r21e
         export ANDROID_NDK_ROOT="/tmp/${NDK_VERSION}"
 
         case $(uname | tr '[:upper:]' '[:lower:]') in

bindings/jni/zyre-jni/CMakeLists.txt

@@ -22,8 +22,8 @@ include_directories (${JAVA_INCLUDE_PATH} ${JAVA_INCLUDE_PATH2} src/native/inclu
 ########################################################################
 find_package(libzmq REQUIRED)
 IF (LIBZMQ_FOUND)
-    include_directories(${LIBZMQ_INCLUDE_DIRS})
-    list(APPEND MORE_LIBRARIES ${LIBZMQ_LIBRARIES})
+    include_directories(${libzmq_INCLUDE_DIRS})
+    list(APPEND MORE_LIBRARIES ${libzmq_LIBRARIES})
 ELSE (LIBZMQ_FOUND)
     message( FATAL_ERROR "libzmq not found." )
 ENDIF (LIBZMQ_FOUND)
@@ -33,8 +33,8 @@ ENDIF (LIBZMQ_FOUND)
 ########################################################################
 find_package(czmq REQUIRED)
 IF (CZMQ_FOUND)
-    include_directories(${CZMQ_INCLUDE_DIRS})
-    list(APPEND MORE_LIBRARIES ${CZMQ_LIBRARIES})
+    include_directories(${czmq_INCLUDE_DIRS})
+    list(APPEND MORE_LIBRARIES ${czmq_LIBRARIES})
 ELSE (CZMQ_FOUND)
     message( FATAL_ERROR "czmq not found." )
 ENDIF (CZMQ_FOUND)
@@ -44,8 +44,8 @@ ENDIF (CZMQ_FOUND)
 ########################################################################
 find_package(zyre REQUIRED)
 IF (ZYRE_FOUND)
-    include_directories(${ZYRE_INCLUDE_DIRS})
-    list(APPEND MORE_LIBRARIES ${ZYRE_LIBRARIES})
+    include_directories(${zyre_INCLUDE_DIRS})
+    list(APPEND MORE_LIBRARIES ${zyre_LIBRARIES})
 ELSE (ZYRE_FOUND)
     message( FATAL_ERROR "zyre not found." )
 ENDIF (ZYRE_FOUND)

bindings/jni/zyre-jni/Findzyre.cmake

@@ -19,26 +19,26 @@ if (NOT MSVC)
 endif (NOT MSVC)
 
 find_path (
-    ZYRE_INCLUDE_DIRS
+    ${CMAKE_FIND_PACKAGE_NAME}_INCLUDE_DIRS
     NAMES zyre.h
     HINTS ${PC_ZYRE_INCLUDE_HINTS}
 )
 
 find_library (
-    ZYRE_LIBRARIES
+    ${CMAKE_FIND_PACKAGE_NAME}_LIBRARIES
     NAMES zyre
     HINTS ${PC_ZYRE_LIBRARY_HINTS}
 )
 
 include(FindPackageHandleStandardArgs)
 
 find_package_handle_standard_args(
-    ZYRE
-    REQUIRED_VARS ZYRE_LIBRARIES ZYRE_INCLUDE_DIRS
+    ${CMAKE_FIND_PACKAGE_NAME}
+    REQUIRED_VARS ${CMAKE_FIND_PACKAGE_NAME}_LIBRARIES ${CMAKE_FIND_PACKAGE_NAME}_INCLUDE_DIRS
 )
 mark_as_advanced(
-    ZYRE_FOUND
-    ZYRE_LIBRARIES ZYRE_INCLUDE_DIRS
+    ${CMAKE_FIND_PACKAGE_NAME}_FOUND
+    ${CMAKE_FIND_PACKAGE_NAME}_LIBRARIES ${CMAKE_FIND_PACKAGE_NAME}_INCLUDE_DIRS
 )
 
 ################################################################################

bindings/jni/zyre-jni/android/CMakeLists.txt

@@ -16,8 +16,8 @@ list(APPEND CMAKE_MODULE_PATH "${CMAKE_CURRENT_LIST_DIR}/../../../..")
 ########################################################################
 find_package(libzmq REQUIRED)
 IF (LIBZMQ_FOUND)
-    include_directories(${LIBZMQ_INCLUDE_DIRS})
-    list(APPEND MORE_LIBRARIES ${LIBZMQ_LIBRARIES})
+    include_directories(${libzmq_INCLUDE_DIRS})
+    list(APPEND MORE_LIBRARIES ${libzmq_LIBRARIES})
 ELSE (LIBZMQ_FOUND)
     message( FATAL_ERROR "libzmq not found." )
 ENDIF (LIBZMQ_FOUND)
@@ -27,8 +27,8 @@ ENDIF (LIBZMQ_FOUND)
 ########################################################################
 find_package(czmq REQUIRED)
 IF (CZMQ_FOUND)
-    include_directories(${CZMQ_INCLUDE_DIRS})
-    list(APPEND MORE_LIBRARIES ${CZMQ_LIBRARIES})
+    include_directories(${czmq_INCLUDE_DIRS})
+    list(APPEND MORE_LIBRARIES ${czmq_LIBRARIES})
 ELSE (CZMQ_FOUND)
     message( FATAL_ERROR "czmq not found." )
 ENDIF (CZMQ_FOUND)
@@ -38,8 +38,8 @@ ENDIF (CZMQ_FOUND)
 ########################################################################
 find_package(zyre REQUIRED)
 IF (ZYRE_FOUND)
-    include_directories(${ZYRE_INCLUDE_DIRS})
-    list(APPEND MORE_LIBRARIES ${ZYRE_LIBRARIES})
+    include_directories(${zyre_INCLUDE_DIRS})
+    list(APPEND MORE_LIBRARIES ${zyre_LIBRARIES})
 ELSE (ZYRE_FOUND)
     message( FATAL_ERROR "zyre not found." )
 ENDIF (ZYRE_FOUND)

bindings/jni/zyre-jni/build.gradle

@@ -12,7 +12,7 @@ ext.hasNotEmptyProperty = { propertyName ->
 
 dependencies {
     compile "org.zeromq.czmq:czmq-jni:$jni_dependencies_version"
-    compile 'org.scijava:native-lib-loader:2.3.4'
+    compile 'org.scijava:native-lib-loader:2.3.5'
     testCompile 'junit:junit:4.12'
     testCompile 'org.hamcrest:hamcrest-all:1.3'
 }

builds/android/README.md

@@ -5,12 +5,12 @@
 You need the Android Native Development Kit (NDK) installed. See
 [here](https://developer.android.com/ndk) to download it.
 
-This project is tested against Android NDK version r21d.
+This project is tested against Android NDK version r21e.
 
-If you installed version r21d all you have to do is to expose the NDK root
+If you installed version r21e all you have to do is to expose the NDK root
 directory as environment variable, e.g:
 
-    export ANDROID_NDK_ROOT=$HOME/android-ndk-r21d
+    export ANDROID_NDK_ROOT=$HOME/android-ndk-r21e
 
 If you installed another version you have to expose the NDK root directory as
 well as the NDK version, e.g:

builds/android/build.sh

@@ -53,8 +53,8 @@ case $(uname | tr '[:upper:]' '[:lower:]') in
 esac
 
 # Set default values used in ci builds
-export NDK_VERSION=${NDK_VERSION:-android-ndk-r21d}
-# With NDK r21d, the minimum SDK version range is [16, 29].
+export NDK_VERSION=${NDK_VERSION:-android-ndk-r21e}
+# With NDK r21e, the minimum SDK version range is [16, 29].
 # SDK version 21 is the minimum version for 64-bit builds.
 export MIN_SDK_VERSION=${MIN_SDK_VERSION:-21}
 

builds/android/ci_build.sh

@@ -4,7 +4,7 @@
 #  Read the zproject/README.md for information about making permanent changes. #
 ################################################################################
 
-export NDK_VERSION=android-ndk-r21d
+export NDK_VERSION=android-ndk-r21e
 export ANDROID_NDK_ROOT="/tmp/${NDK_VERSION}"
 
 case $(uname | tr '[:upper:]' '[:lower:]') in

builds/check_zproto/ci_build.sh

@@ -5,7 +5,8 @@ set -ex
 # ci_build.sh script, which sets some envvars (like REPO_DIR below).
 [ -n "${REPO_DIR-}" ] || exit 1
 
-docker run -e GSL_BUILD_DIR=/code/src -v "$REPO_DIR":/code zeromqorg/zproto -zproject:1 -q zre_msg.xml
+docker run -e GSL_BUILD_DIR=/code/src -e BUILD_DIR=/code/src \
+    -v "$REPO_DIR":/code zeromqorg/zproto -zproject:1 -q zre_msg.xml
 
 # keep an eye on git version used by CI
 git --version

packaging/redhat/zyre.spec

@@ -38,7 +38,7 @@ Name:           zyre
 Version:        2.0.1
 Release:        1
 Summary:        an open-source framework for proximity-based p2p apps
-License:        MPL-2.0
+License:        MPLv2
 URL:            https://github.com/zeromq/zyre
 Source0:        %{name}-%{version}.tar.gz
 Group:          System/Libraries