# HG changeset patch # User František Kučera # Date 1618512310 -7200 # Node ID 18bb23fc811fa903073ba9990e7c1b4327e741a7 # Parent 6cc69304831826cebcad1701da02a1876a24860d cmake: add MAGICKCORE_HDRI_ENABLE=0 and MAGICKCORE_QUANTUM_DEPTH=16 needed for Magick++ diff -r 6cc693048318 -r 18bb23fc811f nbproject/configurations.xml --- a/nbproject/configurations.xml Wed Apr 14 22:02:23 2021 +0200 +++ b/nbproject/configurations.xml Thu Apr 15 20:45:10 2021 +0200 @@ -67,7 +67,8 @@ false - + @@ -86,6 +87,10 @@ /usr/include/ImageMagick-6 build/Debug/src + + MAGICKCORE_HDRI_ENABLE=0 + MAGICKCORE_QUANTUM_DEPTH=16 + diff -r 6cc693048318 -r 18bb23fc811f src/CMakeLists.txt --- a/src/CMakeLists.txt Wed Apr 14 22:02:23 2021 +0200 +++ b/src/CMakeLists.txt Thu Apr 15 20:45:10 2021 +0200 @@ -17,7 +17,7 @@ # Relpipe libraries: INCLUDE(FindPkgConfig) -pkg_check_modules (RELPIPE_LIBS relpipe-lib-writer.cpp relpipe-lib-cli.cpp zbar Magick++) +pkg_check_modules (RELPIPE_LIBS REQUIRED relpipe-lib-writer.cpp relpipe-lib-cli.cpp zbar Magick++) include_directories(${RELPIPE_LIBS_INCLUDE_DIRS}) link_directories(${RELPIPE_LIBS_LIBRARY_DIRS}) @@ -32,6 +32,8 @@ relpipe-in-qr.cpp ) +add_definitions (${RELPIPE_LIBS_CFLAGS_OTHER}) + # Link libraries: target_link_libraries(${EXECUTABLE_FILE} ${RELPIPE_LIBS_LIBRARIES}) set_property(TARGET ${EXECUTABLE_FILE} PROPERTY INSTALL_RPATH_USE_LINK_PATH TRUE)