Problem: out of date with zproject

Solution: regenerate

Author: bluca

CMakeLists.txt

@@ -102,52 +102,52 @@ 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)
 
 ########################################################################
 # ZYRE dependency
 ########################################################################
 find_package(zyre REQUIRED)
-IF (ZYRE_FOUND)
-    include_directories(${ZYRE_INCLUDE_DIRS})
-    list(APPEND MORE_LIBRARIES ${ZYRE_LIBRARIES})
+IF (zyre_FOUND)
+    include_directories(${zyre_INCLUDE_DIRS})
+    list(APPEND MORE_LIBRARIES ${zyre_LIBRARIES})
   IF (PC_ZYRE_FOUND)
       set(pkg_config_names_private "${pkg_config_names_private} libzyre")
       list(APPEND OPTIONAL_LIBRARIES_STATIC ${PC_ZYRE_STATIC_LDFLAGS})
   ELSE (PC_ZYRE_FOUND)
       set(pkg_config_libs_private "${pkg_config_libs_private} -lzyre")
   ENDIF (PC_ZYRE_FOUND)
-ELSE (ZYRE_FOUND)
+ELSE (zyre_FOUND)
     message( FATAL_ERROR "zyre not found." )
-ENDIF (ZYRE_FOUND)
+ENDIF (zyre_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
 )
 
 ################################################################################

Findzyre.cmake

@@ -4,7 +4,7 @@
 ################################################################################
 
 if (NOT MSVC)
-    include(FindPkgConfig)
+    find_package(PkgConfig)
     pkg_check_modules(PC_ZYRE "libzyre")
     if (PC_ZYRE_FOUND)
         # add CFLAGS from pkg-config file, e.g. draft api.
@@ -18,26 +18,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 libzyre 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
 )
 
 ################################################################################

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 glar_node.xml
+docker run -e GSL_BUILD_DIR=/code/src -e BUILD_DIR=/code/src \
+    -v "$REPO_DIR":/code zeromqorg/zproto -zproject:1 -q glar_node.xml
 
 # keep an eye on git version used by CI
 git --version

packaging/redhat/glar150.spec

@@ -24,7 +24,7 @@ Name:           glar150
 Version:        0.0.1
 Release:        1
 Summary:        gl-ar150 demo using zyre
-License:        MPLv2
+License:        MPL-2.0
 URL:            https://github.com/ZMQers/glar150
 Source0:        %{name}-%{version}.tar.gz
 Group:          System/Libraries