summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorUwe Klotz <uklotz@mixxx.org>2021-01-06 23:42:10 +0100
committerGitHub <noreply@github.com>2021-01-06 23:42:10 +0100
commitad2b918603c7bb44dbf10818a9af33c3529ff2c8 (patch)
treeb8aaa237a89cdfd4bce0cb6f207d77dff7d8f61a
parentd688a25873c3432a9cf47cba66543e7176c9e10f (diff)
parent2372ad1fe0049e5c3653ffd8e63611c62859e369 (diff)
Merge pull request #3539 from Holzhaus/proto
CMake: Use new-style protobuf_generate function
-rw-r--r--src/proto/CMakeLists.txt19
1 files changed, 10 insertions, 9 deletions
diff --git a/src/proto/CMakeLists.txt b/src/proto/CMakeLists.txt
index e5fc68fa74..5bebf0f318 100644
--- a/src/proto/CMakeLists.txt
+++ b/src/proto/CMakeLists.txt
@@ -1,16 +1,17 @@
# Protobuf
find_package(Protobuf)
-protobuf_generate_cpp(
- PROTO_SOURCES
- PROTO_HEADERS
- beats.proto
- headers.proto
- keys.proto
- skin.proto
- waveform.proto
+add_library(mixxx-proto OBJECT)
+protobuf_generate(
+ LANGUAGE cpp
+ TARGET mixxx-proto
+ PROTOS
+ beats.proto
+ headers.proto
+ keys.proto
+ skin.proto
+ waveform.proto
)
-add_library(mixxx-proto STATIC ${PROTO_SOURCES} ${PROTO_HEADERS})
if(TARGET protobuf::libprotobuf-lite)
target_link_libraries(mixxx-proto PUBLIC protobuf::libprotobuf-lite)
elseif(TARGET protobuf::libprotobuf)