From 36357d44239c8050e0f36368fa5bc0238a0fb1c9 Mon Sep 17 00:00:00 2001 From: "Phyks (Lucas Verney)" Date: Thu, 19 May 2016 17:59:33 +0200 Subject: [PATCH] Fix CMakeLists.txt --- CMakeLists.txt | 15 +++------------ 1 file changed, 3 insertions(+), 12 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index 49a7ad3..44adf94 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -6,21 +6,12 @@ add_subdirectory (bliss) file (GLOB COMMON_SRC "src/*.c") -# TODO \/ find_package(PkgConfig REQUIRED) pkg_check_modules(MULTIMEDIA REQUIRED libavformat libavutil libavcodec) -pkg_check_modules(RESAMPLE QUIET libswresample) -if(NOT RESAMPLE_FOUND) - pkg_check_modules(RESAMPLE REQUIRED libavresample) - set(AVRESAMPLE TRUE) -else() - set(AVRESAMPLE FALSE) -endif() -include_directories(${MULTIMEDIA_INCLUDE_DIRS} ${RESAMPLE_INCLUDE_DIRS} include/ bliss/include) -link_directories(${MULTIMEDIA_LIBRARY_DIRS} ${RESAMPLE_LIBRARY_DIRS}) -add_definitions(${MULTIMEDIA_CFLAGS_OTHER} ${RESAMPLE_CFLAGS_OTHER}) +include_directories(${MULTIMEDIA_INCLUDE_DIRS} include/ bliss/include) +link_directories(${MULTIMEDIA_LIBRARY_DIRS}) +add_definitions(${MULTIMEDIA_CFLAGS_OTHER}) add_definitions (-Wall -Wno-long-long -pedantic -std=c99) -# TODO /\ add_executable (mpdbliss ${COMMON_SRC} "main_mpd.c")