Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
13 changes: 13 additions & 0 deletions modules/CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -30,5 +30,18 @@ option(BUILD_DOC "Build documentation" OFF)

option(LIBZIP_DO_INSTALL "Install libzip and the related files" OFF)
option(BUILD_SHARED_LIBS "Build shared libraries (DLLs)." OFF)
# Arch's zstd package only provides libzstd.so, not libzstd.a, so
# libzip's Findzstd.cmake won't create the zstd::libzstd_static target.
# Create it ourselves so libzip can link against the system zstd.
if(NOT TARGET zstd::libzstd_static)
find_library(ZSTD_LIBRARY zstd)
if(ZSTD_LIBRARY)
add_library(zstd::libzstd_static UNKNOWN IMPORTED)
set_target_properties(zstd::libzstd_static PROPERTIES
IMPORTED_LOCATION "${ZSTD_LIBRARY}"
INTERFACE_INCLUDE_DIRECTORIES "/usr/include"
)
endif()
endif()
add_subdirectory("libzip")

3 changes: 2 additions & 1 deletion src/CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -887,6 +887,8 @@ add_executable(pipedaladmind AdminMain.cpp CommandLineParser.hpp
)
target_link_libraries(pipedaladmind PRIVATE PiPedalCommon pthread atomic stdc++fs systemd asound)

if(NOT PIPEDAL_DISABLE_COPYRIGHT_BUILD)

add_executable(processcopyrights copyrightMain.cpp
CommandLineParser.hpp
PiPedalException.hpp
Expand Down Expand Up @@ -924,7 +926,6 @@ WORKING_DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR}
COMMENT "Updating copyright notices."
)

if(NOT PIPEDAL_DISABLE_COPYRIGHT_BUILD)
add_custom_target (
CopyrightBuild ALL
DEPENDS ${REACT_NOTICES_FILE}
Expand Down