Minor changes related to library linking
This commit is contained in:
@@ -18,6 +18,7 @@ find_package(Wt REQUIRED COMPONENTS Wt Dbo DboSqlite3 HTTP)
|
|||||||
find_package(PAM)
|
find_package(PAM)
|
||||||
find_package(STB)
|
find_package(STB)
|
||||||
pkg_check_modules(GRAPHICSMAGICKXX GraphicsMagick++)
|
pkg_check_modules(GRAPHICSMAGICKXX GraphicsMagick++)
|
||||||
|
pkg_check_modules(CONFIG++ REQUIRED IMPORTED_TARGET libconfig++)
|
||||||
|
|
||||||
# WT
|
# WT
|
||||||
if (NOT Wt_FOUND)
|
if (NOT Wt_FOUND)
|
||||||
|
|||||||
@@ -36,7 +36,7 @@ elseif (IMAGE_LIBRARY STREQUAL GraphicsMagick++)
|
|||||||
target_compile_options(lmscover PRIVATE "-DLMS_SUPPORT_IMAGE_GM")
|
target_compile_options(lmscover PRIVATE "-DLMS_SUPPORT_IMAGE_GM")
|
||||||
target_include_directories(lmscover PRIVATE ${GRAPHICSMAGICKXX_INCLUDE_DIRS})
|
target_include_directories(lmscover PRIVATE ${GRAPHICSMAGICKXX_INCLUDE_DIRS})
|
||||||
target_compile_options(lmscover PRIVATE ${GRAPHICSMAGICKXX_CFLAGS_OTHER})
|
target_compile_options(lmscover PRIVATE ${GRAPHICSMAGICKXX_CFLAGS_OTHER})
|
||||||
target_link_libraries(lmscover PRIVATE ${GRAPHICSMAGICKXX_LIBRARIES})
|
target_link_libraries(lmscover PRIVATE ${GRAPHICSMAGICKXX_LINK_LIBRARIES})
|
||||||
else ()
|
else ()
|
||||||
message(FATAL_ERROR "Invalid IMAGE_LIBRARY provided")
|
message(FATAL_ERROR "Invalid IMAGE_LIBRARY provided")
|
||||||
endif()
|
endif()
|
||||||
|
|||||||
@@ -14,7 +14,7 @@ target_include_directories(lmsmetadata PRIVATE
|
|||||||
|
|
||||||
target_link_libraries(lmsmetadata PRIVATE
|
target_link_libraries(lmsmetadata PRIVATE
|
||||||
lmsav
|
lmsav
|
||||||
tag
|
${Taglib_LIBRARIES}
|
||||||
)
|
)
|
||||||
|
|
||||||
target_link_libraries(lmsmetadata PUBLIC
|
target_link_libraries(lmsmetadata PUBLIC
|
||||||
|
|||||||
@@ -22,7 +22,7 @@ target_include_directories(lmsutils PRIVATE
|
|||||||
)
|
)
|
||||||
|
|
||||||
target_link_libraries(lmsutils PRIVATE
|
target_link_libraries(lmsutils PRIVATE
|
||||||
config++
|
PkgConfig::CONFIG++
|
||||||
)
|
)
|
||||||
|
|
||||||
target_link_libraries(lmsutils PUBLIC
|
target_link_libraries(lmsutils PUBLIC
|
||||||
|
|||||||
Reference in New Issue
Block a user