CMake: remove link library paths

strukturag · Jul 3, 2023 · fea165e · fea165e
1 parent 445cfac
commit fea165e
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 7 deletions.
diff --git 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
@@ -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}")