Build proto files in cmake

acoustid · Feb 25, 2024 · feb0535 · feb0535
1 parent 17fa756
commit feb0535
Show file tree

Hide file tree

Showing 4 changed files with 34 additions and 12 deletions.
diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
@@ -19,7 +19,6 @@ jobs:
       - run: |
           sudo apt-get update
           sudo apt-get install -y qt6-base-dev libgtest-dev libgrpc++-dev protobuf-compiler-grpc protobuf-compiler libsqlite3-dev
-      - run: ./update_proto.sh
       - run: cmake -DCMAKE_BUILD_TYPE=Release .
       - run: make
       - run: make check

diff --git a/.github/workflows/codeql-analysis.yml b/.github/workflows/codeql-analysis.yml
@@ -55,10 +55,6 @@ jobs:
         sudo apt-get update
         sudo apt-get install -y qt6-base-dev libgtest-dev libgrpc++-dev protobuf-compiler-grpc protobuf-compiler libsqlite3-dev
 
-    - name: Build proto files
-      run: |
-        ./update_proto.sh
-
     # Autobuild attempts to build any compiled languages  (C/C++, C#, or Java).
     # If this step fails, then you should remove it and run the build manually (see below)
     - name: Autobuild

diff --git a/CMakeLists.txt b/CMakeLists.txt
@@ -138,6 +138,40 @@ set(fpserver_SOURCES
 add_library(fpserverlib ${fpserver_SOURCES})
 target_link_libraries(fpserverlib fpindexlib qhttp PkgConfig::GRPCPP PkgConfig::PROTOBUF)
 
+add_custom_command(
+    COMMAND
+        protoc
+          -Isrc/server/grpc/proto
+	  --cpp_out=src/server/grpc/proto
+	  --grpc_out=src/server/grpc/proto
+          --plugin=protoc-gen-grpc=/usr/bin/grpc_cpp_plugin
+	  src/server/grpc/proto/index.proto
+    OUTPUT
+      src/server/grpc/proto/index.pb.h
+      src/server/grpc/proto/index.pb.cc
+      src/server/grpc/proto/index.grpc.pb.h
+      src/server/grpc/proto/index.grpc.pb.cc
+    DEPENDS
+      src/server/grpc/proto/index.proto
+)
+
+add_custom_command(
+    COMMAND
+	protoc
+	  -Isrc/server/grpc/proto
+	  --cpp_out=${CMAKE_CURRENT_SOURCE_DIR}/src/server/grpc/proto
+	  src/server/grpc/proto/google/api/annotations.proto
+	  src/server/grpc/proto/google/api/http.proto
+    OUTPUT
+      src/server/grpc/proto/google/api/annotations.pb.h
+      src/server/grpc/proto/google/api/annotations.pb.cc
+      src/server/grpc/proto/google/api/http.pb.h
+      src/server/grpc/proto/google/api/http.pb.cc
+    DEPENDS
+      src/server/grpc/proto/google/api/annotations.proto
+      src/server/grpc/proto/google/api/http.proto
+)
+
 include_directories(
 	${CMAKE_CURRENT_SOURCE_DIR}/src
 	${CMAKE_CURRENT_SOURCE_DIR}/src/server/grpc/proto

diff --git a/update_proto.sh b/update_proto.sh