From de931b95f6dc358b20fdfdf493013fcd673ac70a Mon Sep 17 00:00:00 2001 From: rimio Date: Thu, 10 Jan 2019 01:29:40 +0200 Subject: PD120 somewhat working --- CMakeLists.txt | 12 +++++------- 1 file changed, 5 insertions(+), 7 deletions(-) (limited to 'CMakeLists.txt') diff --git a/CMakeLists.txt b/CMakeLists.txt index 5ce0377..720c483 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -43,22 +43,20 @@ set (ENCODE_TOOL_SOURCES ) # Dependencies -find_library (GLOG_LIBRARY glog) -find_library (LIQUID_LIBRARY liquid) -find_package (gflags REQUIRED) -find_package (X11 REQUIRED) +find_library(GLOG_LIBRARY glog) +find_package(gflags REQUIRED) +find_package(ImageMagick COMPONENTS Magick++) # Library (C compiler) add_library (${PROJECT_NAME} SHARED ${LIB_SOURCES}) set_property (TARGET ${PROJECT_NAME} PROPERTY LINKER_LANGUAGE C) target_include_directories (${PROJECT_NAME} PUBLIC "${SRC_DIR}" PUBLIC "${INCLUDE_DIR}") -target_link_libraries (${PROJECT_NAME} liquid) # Tools (C++ compiler) if (BUILD_TOOLS) add_executable (${PROJECT_NAME}-encode ${ENCODE_TOOL_SOURCES}) set_property (TARGET ${PROJECT_NAME}-encode PROPERTY LINKER_LANGUAGE CXX) set_property (TARGET ${PROJECT_NAME}-encode PROPERTY CXX_STANDARD 14) - target_include_directories(${PROJECT_NAME}-encode PUBLIC "${SRC_DIR}/tools" PUBLIC "${INCLUDE_DIR}") - target_link_libraries (${PROJECT_NAME}-encode ${PROJECT_NAME} glog gflags X11 sndfile) + target_include_directories(${PROJECT_NAME}-encode PUBLIC "${SRC_DIR}/tools" PUBLIC "${INCLUDE_DIR}" PUBLIC "${ImageMagick_INCLUDE_DIRS}") + target_link_libraries (${PROJECT_NAME}-encode ${PROJECT_NAME} glog gflags sndfile ${ImageMagick_LIBRARIES}) endif (BUILD_TOOLS) \ No newline at end of file -- cgit v1.2.3