From 2356813f4413ccf7b16342abf927ba1d56b4ad43 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Milo=C5=A1=20Komar=C4=8Devi=C4=87?= Date: Tue, 18 Jul 2023 11:54:36 +0200 Subject: [PATCH] CMake: remove link library paths --- libheif/CMakeLists.txt | 2 +- libheif/plugins/CMakeLists.txt | 8 ++------ 2 files changed, 3 insertions(+), 7 deletions(-) diff --git a/libheif/CMakeLists.txt b/libheif/CMakeLists.txt index 7e6e4eb7817..d2723f9fa89 100644 --- a/libheif/CMakeLists.txt +++ b/libheif/CMakeLists.txt @@ -106,7 +106,7 @@ if (LIBSHARPYUV_FOUND) message("Compiling in 'libsharpyuv'") target_compile_definitions(heif PUBLIC HAVE_LIBSHARPYUV=1) target_include_directories(heif PRIVATE ${LIBSHARPYUV_INCLUDE_DIRS}) - target_link_libraries(heif PRIVATE ${LIBSHARPYUV_LIBRARIES} ${LIBSHARPYUV_LINKDIR}) + target_link_libraries(heif PRIVATE ${LIBSHARPYUV_LIBRARIES}) else () message("Not compiling 'libsharpyuv'") endif () diff --git a/libheif/plugins/CMakeLists.txt b/libheif/plugins/CMakeLists.txt index 79f8e7f2795..ddea01433f4 100644 --- a/libheif/plugins/CMakeLists.txt +++ b/libheif/plugins/CMakeLists.txt @@ -1,10 +1,6 @@ macro(plugin_compilation name varName optionName defineName) if (${varName}_FOUND AND WITH_${optionName}) - if (NOT "${${varName}_LIBRARY_DIRS}" STREQUAL "") - set(${varName}_LINKDIR "-L${${varName}_LIBRARY_DIRS}") - endif () - if (PLUGIN_LOADING_SUPPORTED_AND_ENABLED AND WITH_${optionName}_PLUGIN) message("Compiling '" ${name} "' as dynamic plugin") add_library(heif-${name} @@ -21,7 +17,7 @@ macro(plugin_compilation name varName optionName defineName) HAVE_VISIBILITY) target_compile_definitions(heif-${name} PRIVATE PLUGIN_${defineName}=1) target_include_directories(heif-${name} PRIVATE ${PROJECT_SOURCE_DIR} ${libheif_BINARY_DIR} ${libheif_SOURCE_DIR} ${${varName}_INCLUDE_DIRS}) - target_link_libraries(heif-${name} PRIVATE ${${varName}_LIBRARIES} ${${varName}_LINKDIR} heif) + target_link_libraries(heif-${name} PRIVATE ${${varName}_LIBRARIES} heif) install(TARGETS heif-${name} LIBRARY DESTINATION ${PLUGIN_DIRECTORY} @@ -31,7 +27,7 @@ macro(plugin_compilation name varName optionName defineName) target_sources(heif PRIVATE ${${optionName}_sources}) target_compile_definitions(heif PRIVATE HAVE_${defineName}=1) target_include_directories(heif PRIVATE ${${varName}_INCLUDE_DIRS}) - target_link_libraries(heif PRIVATE ${${varName}_LIBRARIES} ${${varName}_LINKDIR}) + target_link_libraries(heif PRIVATE ${${varName}_LIBRARIES}) endif () set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} ${${varName}_CFLAGS}")