Funkwhale
/
strawberry-audio-player-windows-mac-linux
mirror of https://github.com/strawberrymusicplayer/strawberry
1
0
Fork 0
Code Issues Releases Wiki Activity

Use find_package Protobuf CONFIG

This commit is contained in:
Jonas Kvinge 2023-05-14 21:52:55 +02:00
parent 58278ab1e4
commit b52ffd09b2
2 changed files with 17 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
CMakeLists.txt
View File

@ -117,9 +117,14 @@ else()
find_package(Iconv) find_package(Iconv)
endif() endif()
find_package(GnuTLS REQUIRED) find_package(GnuTLS REQUIRED)
find_package(Protobuf REQUIRED) if(NOT APPLE)
if(NOT Protobuf_PROTOC_EXECUTABLE) find_package(Protobuf CONFIG)
message(FATAL_ERROR "Missing protobuf compiler.") endif()
if(NOT Protobuf_FOUND)
find_package(Protobuf REQUIRED)
endif()
if(NOT TARGET protobuf::protoc)
message(FATAL_ERROR "Missing Protobuf compiler.")
endif() endif()
if(LINUX) if(LINUX)
find_package(ALSA REQUIRED) find_package(ALSA REQUIRED)

17
ext/libstrawberry-tagreader/CMakeLists.txt
View File

@ -1,5 +1,14 @@
cmake_minimum_required(VERSION 3.7) cmake_minimum_required(VERSION 3.7)
# Workaround a bug in protobuf-generate.cmake (https://github.com/protocolbuffers/protobuf/issues/12450)
if(NOT protobuf_PROTOC_EXE)
set(protobuf_PROTOC_EXE "protobuf::protoc")
endif()
if(NOT Protobuf_LIBRARIES)
set(Protobuf_LIBRARIES protobuf::libprotobuf protobuf::libprotoc)
endif()
set(SOURCES tagreaderbase.cpp tagreadermessages.proto) set(SOURCES tagreaderbase.cpp tagreadermessages.proto)
if(USE_TAGLIB AND TAGLIB_FOUND) if(USE_TAGLIB AND TAGLIB_FOUND)
@ -47,14 +56,6 @@ target_link_libraries(libstrawberry-tagreader PRIVATE
libstrawberry-common libstrawberry-common
) )
if(WIN32 AND Protobuf_VERSION VERSION_GREATER_EQUAL 4.22.0)
if (MSVC)
target_link_libraries(libstrawberry-tagreader PRIVATE abseil_dll)
else()
target_link_libraries(libstrawberry-tagreader PRIVATE absl_log_internal_message absl_log_internal_check_op)
endif()
endif()
if(USE_TAGLIB AND TAGLIB_FOUND) if(USE_TAGLIB AND TAGLIB_FOUND)
target_include_directories(libstrawberry-tagreader SYSTEM PRIVATE ${TAGLIB_INCLUDE_DIRS}) target_include_directories(libstrawberry-tagreader SYSTEM PRIVATE ${TAGLIB_INCLUDE_DIRS})
target_link_libraries(libstrawberry-tagreader PRIVATE ${TAGLIB_LIBRARIES}) target_link_libraries(libstrawberry-tagreader PRIVATE ${TAGLIB_LIBRARIES})