.drone.yml

@@ -1,48 +0,0 @@
-kind: pipeline
-type: kubernetes
-name: build-amd64
-platform:
-  arch: amd64
-node_selector:
-  kubernetes.io/arch: amd64
-
-steps:
-  - name: submodules
-    image: alpine/git
-    commands:
-      - git submodule update --init --recursive
-
-  - name: build-amd64
-    image: debian:bookworm-slim
-    commands:
-        - apt-get update
-        - apt-get -qy install gcc-12 libsodium-dev cmake make build-essential pkg-config
-        - mkdir build
-        - cd build; cmake ..
-        - make -j 4 
-        - make test
-
---- 
-kind: pipeline
-type: kubernetes
-name: build-arm64
-platform:
-  arch: arm64
-node_selector:
-  kubernetes.io/arch: arm64
-
-steps:
-  - name: submodules
-    image: alpine/git
-    commands:
-      - git submodule update --init --recursive
-
-  - name: build-arm64
-    image: debian:bookworm-slim
-    commands:
-        - apt-get update
-        - apt-get -qy install gcc-12 libsodium-dev cmake make build-essential pkg-config
-        - mkdir build
-        - cd build; cmake ..
-        - make -j 4 
-        - make test

CMakeLists.txt

@@ -45,8 +45,8 @@ IF(NOT TARGET libzmq)
   set(BUILD_STATIC ON CACHE BOOL "enable building zmq as static library")
   set(ENABLE_DRAFTS ON CACHE BOOL "enable zmq drafts")
   set(ENABLE_RADIX_TREE ON CACHE BOOL "enable ENABLE_RADIX_TREE drafts")
-  set(ENABLE_WS OFF CACHE BOOL "enable websocket support")
-  set(WITH_OPENPGM OFF CACHE BOOL "enable pgm protocol")
+  set(ENABLE_WS ON CACHE BOOL "enable websocket support")
+  set(WITH_OPENPGM ON CACHE BOOL "enable pgm protocol")
   set(WITH_LIBSODIUM ON CACHE BOOL "enable static libsodium support")
   set(WITH_LIBSODIUM_STATIC ON CACHE BOOL "enable static libsodium support")
   set(ENABLE_CURVE ON CACHE BOOL "enable curve cryptography in libsodium support")
@@ -65,8 +65,6 @@ IF(NOT TARGET protobuf)
   SET(protobuf_BUILD_SHARED_LIBS OFF CACHE BOOL "disable shared libraries")
   #SET(WITH_PROTOC ON CACHE BOOL "enable building of protoc")
   add_subdirectory(libs/protobuf EXCLUDE_FROM_ALL)
-  set(PROTOC ${CMAKE_CURRENT_BINARY_DIR}/libs/protobuf/protoc CACHE INTERNAL "" )
-  set(PROTO_SRC_PATH ${CMAKE_CURRENT_SOURCE_DIR}/libs/protobuf/src CACHE INTERNAL "" )
 ENDIF()
 
 # we are building with c++20

cmake/Modules/protobuf.cmake

@@ -13,6 +13,8 @@ function(protobuf_generate_cpp)
                         ${ARGN})
 
     FILE(GLOB PROTO_FILES ${protobuf_PROTO_PATH}/*.proto)
+    set(PROTOC ${CMAKE_BINARY_DIR}/libs/protobuf/protoc)
+    # set(PROTOC protoc)
 
    FOREACH(proto ${PROTO_FILES})
      FILE(TO_NATIVE_PATH ${proto} proto_native)
@@ -23,7 +25,7 @@ function(protobuf_generate_cpp)
      add_custom_command(
          OUTPUT "${protoDIR}/${protoFILENAME}.pb.cc"
          DEPENDS "${protoDIR}/${protoFILENAME}.proto"
-         COMMAND ${PROTOC} --cpp_out=${protoDIR} --proto_path=${protoDIR} --proto_path=${PROTO_SRC_PATH} "${protoDIR}/${protoFILENAME}.proto"
+         COMMAND ${PROTOC} --cpp_out=${protoDIR} --proto_path=${protoDIR} --proto_path="${CMAKE_SOURCE_DIR}/libs/protobuf/src" "${protoDIR}/${protoFILENAME}.proto"
      )
     
   ENDFOREACH(proto)