Skip to content

Commit

Permalink
Update Debian packaging
Browse files Browse the repository at this point in the history
  • Loading branch information
complexlogic committed Sep 15, 2022
1 parent a4ec180 commit 29c124d
Show file tree
Hide file tree
Showing 2 changed files with 9 additions and 9 deletions.
6 changes: 3 additions & 3 deletions CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -92,7 +92,7 @@ if (WIN32)
install(DIRECTORY ${PROJECT_BINARY_DIR}/$<CONFIG>/ DESTINATION ".")
foreach(item "CHANGELOG" "LICENSE")
configure_file("${PROJECT_SOURCE_DIR}/${item}" "${PROJECT_BINARY_DIR}/${item}.txt")
install(FILES "${PROJECT_BINARY_DIR}/${item}.txt" DESTINATION ".")
install(FILES "${PROJECT_BINARY_DIR}/${item}.txt" DESTINATION ".")
endforeach ()

# Install presets
Expand Down Expand Up @@ -133,7 +133,7 @@ elseif (UNIX)
if (NOT CPACK_DEBIAN_PACKAGE_ARCHITECTURE)
set(CPACK_DEBIAN_PACKAGE_ARCHITECTURE "amd64")
endif()
set(CPACK_DEBIAN_PACKAGE_DEPENDS "libavcodec58 (>= 4.2.4), libavutil56 (>= 4.2.4), libswresample3 (>= 4.2.4), libavformat58 (>= 4.2.4), libtag1v5 (>= 1.11.1), libebur128-1 (>=1.2.4), fmtlib, libinih1, libc6 (>=2.29), libstdc++6 (>=10.2)")
set(CPACK_DEBIAN_PACKAGE_DEPENDS "libavcodec58 (>= 4.2.4), libavutil56 (>= 4.2.4), libswresample3 (>= 4.2.4), libavformat58 (>= 4.2.4), libebur128-1 (>=1.2.4), libfmt7, libinih1, libc6 (>=2.29), libstdc++6 (>=10.2), zlib1g")
set(CPACK_DEBIAN_PACKAGE_MAINTAINER "complexlogic")
set(CPACK_DEBIAN_PACKAGE_SECTION "utils")
set(CPACK_DEBIAN_ARCHIVE_TYPE "gnutar")
Expand All @@ -156,4 +156,4 @@ elseif (UNIX)
endif()
endif()

configure_file("${PROJECT_SOURCE_DIR}/config/config.h.in" "${PROJECT_BINARY_DIR}/config.h")
configure_file("${PROJECT_SOURCE_DIR}/config/config.h.in" "${PROJECT_BINARY_DIR}/config.h")
12 changes: 6 additions & 6 deletions src/CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -12,9 +12,9 @@ if (WIN32)
)
target_link_libraries(${EXECUTABLE_TITLE}
${LIBAVFORMAT}
${LIBAVCODEC}
${LIBAVUTIL}
${LIBSWRESAMPLE}
${LIBAVCODEC}
${LIBAVUTIL}
${LIBSWRESAMPLE}
${TAGLIB}
${LIBEBUR128}
${FMT}
Expand All @@ -38,9 +38,9 @@ elseif (UNIX)
PkgConfig::FMT
)

# GCC 10 requires linking with pthread for some reason
if (CMAKE_COMPILER_IS_GNUCC AND CMAKE_CXX_COMPILER_VERSION VERSION_LESS 11)
# GCC 10 requires linking directly with pthread for some reason
if (CMAKE_CXX_COMPILER_ID STREQUAL "GNU" AND CMAKE_CXX_COMPILER_VERSION VERSION_LESS 11)
target_link_libraries(${EXECUTABLE_TITLE} pthread)
endif ()
endif()
set (EXECUTABLE_OUTPUT_PATH "${PROJECT_BINARY_DIR}")
set (EXECUTABLE_OUTPUT_PATH "${PROJECT_BINARY_DIR}")

0 comments on commit 29c124d

Please sign in to comment.