diff --git a/CMakeLists.txt b/CMakeLists.txt index 6cd7a07..b5316b9 100755 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -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 @@ -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") @@ -156,4 +156,4 @@ elseif (UNIX) endif() endif() -configure_file("${PROJECT_SOURCE_DIR}/config/config.h.in" "${PROJECT_BINARY_DIR}/config.h") \ No newline at end of file +configure_file("${PROJECT_SOURCE_DIR}/config/config.h.in" "${PROJECT_BINARY_DIR}/config.h") diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt index 9020223..da0e28e 100755 --- a/src/CMakeLists.txt +++ b/src/CMakeLists.txt @@ -12,9 +12,9 @@ if (WIN32) ) target_link_libraries(${EXECUTABLE_TITLE} ${LIBAVFORMAT} - ${LIBAVCODEC} - ${LIBAVUTIL} - ${LIBSWRESAMPLE} + ${LIBAVCODEC} + ${LIBAVUTIL} + ${LIBSWRESAMPLE} ${TAGLIB} ${LIBEBUR128} ${FMT} @@ -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}") \ No newline at end of file +set (EXECUTABLE_OUTPUT_PATH "${PROJECT_BINARY_DIR}")