From 7cea64284d1326d05039b76648cf113040889b10 Mon Sep 17 00:00:00 2001 From: ice0 Date: Feb 21 2020 13:31:12 +0000 Subject: libmng made optional, fixed build using 2-build-cmake.sh --- diff --git a/synfig-core/src/CMakeLists.txt b/synfig-core/src/CMakeLists.txt index 0880974..3402142 100644 --- a/synfig-core/src/CMakeLists.txt +++ b/synfig-core/src/CMakeLists.txt @@ -33,7 +33,8 @@ pkg_check_modules(MLT REQUIRED mlt++) pkg_check_modules(FFTW REQUIRED fftw3) pkg_check_modules(FT REQUIRED freetype2) # for lyr_freetype pkg_check_modules(LIBPNG REQUIRED libpng) # for mod_png -pkg_check_modules(LIBMNG REQUIRED libmng) # for mod_mng +#TODO(ice0): find solution for libmng +pkg_check_modules(LIBMNG libmng) # for mod_mng (set as optional as it is not correctly installed in Debian) pkg_check_modules(LIBJPEG REQUIRED libjpeg) # for mod_mng pkg_check_modules(OPENEXR REQUIRED OpenEXR) # for mod_openexr pkg_check_modules(MAGICKCORE REQUIRED MagickCore) # for Magick++ diff --git a/synfig-studio/src/CMakeLists.txt b/synfig-studio/src/CMakeLists.txt index 033ea71..6f084a3 100644 --- a/synfig-studio/src/CMakeLists.txt +++ b/synfig-studio/src/CMakeLists.txt @@ -21,6 +21,7 @@ include(FindPkgConfig) pkg_check_modules(SIGCPP REQUIRED sigc++-2.0) pkg_check_modules(GTKMM REQUIRED gtkmm-3.0) pkg_check_modules(LIBXML REQUIRED libxml++-2.6) +pkg_check_modules(MLT REQUIRED mlt++) # required for widget_soundwave ## ## Config diff --git a/synfig-studio/src/gui/CMakeLists.txt b/synfig-studio/src/gui/CMakeLists.txt index 3edf51f..3d43018 100644 --- a/synfig-studio/src/gui/CMakeLists.txt +++ b/synfig-studio/src/gui/CMakeLists.txt @@ -71,9 +71,13 @@ include(trees/CMakeLists.txt) include(widgets/CMakeLists.txt) include(workarearenderer/CMakeLists.txt) +target_include_directories(synfigstudio PRIVATE ${MLT_INCLUDE_DIRS}) # required for widget_soundwave + target_link_libraries(synfigstudio ${GTKMM_LIBRARIES} ${Gettext_LIBRARIES} + ${MLT_LIBRARIES} # required for widget_soundwave + ${LIBXML_LIBRARIES} # required for gui/pluginmanager synfig synfigapp )