Only include qtsparkle directories when HAVE_QTSPARKLE is set

This commit is contained in:
Jonas Kvinge 2022-02-07 21:17:36 +01:00
parent e56ca2ffd6
commit dd3c308b09
1 changed files with 9 additions and 4 deletions

View File

@ -943,7 +943,6 @@ link_directories(
${SQLITE_LIBRARY_DIRS} ${SQLITE_LIBRARY_DIRS}
${SINGLEAPPLICATION_LIBRARY_DIRS} ${SINGLEAPPLICATION_LIBRARY_DIRS}
${SINGLECOREAPPLICATION_LIBRARY_DIRS} ${SINGLECOREAPPLICATION_LIBRARY_DIRS}
${QTSPARKLE_LIBRARY_DIRS}
${Iconv_LIBRARY_DIRS} ${Iconv_LIBRARY_DIRS}
) )
@ -1010,6 +1009,10 @@ if(USE_TAGPARSER AND TAGPARSER_FOUND)
link_directories(${TAGPARSER_LIBRARY_DIRS}) link_directories(${TAGPARSER_LIBRARY_DIRS})
endif() endif()
if(HAVE_QTSPARKLE)
link_directories(${QTSPARKLE_LIBRARY_DIRS})
endif()
add_library(strawberry_lib STATIC add_library(strawberry_lib STATIC
${SOURCES} ${SOURCES}
${MOC} ${MOC}
@ -1054,7 +1057,6 @@ target_link_libraries(strawberry_lib PUBLIC
${QT_LIBRARIES} ${QT_LIBRARIES}
${SINGLEAPPLICATION_LIBRARIES} ${SINGLEAPPLICATION_LIBRARIES}
${SINGLECOREAPPLICATION_LIBRARIES} ${SINGLECOREAPPLICATION_LIBRARIES}
${QTSPARKLE_LIBRARIES}
${Iconv_LIBRARIES} ${Iconv_LIBRARIES}
libstrawberry-common libstrawberry-common
libstrawberry-tagreader libstrawberry-tagreader
@ -1159,8 +1161,6 @@ if(WIN32)
target_link_libraries(strawberry_lib PRIVATE dsound dwmapi) target_link_libraries(strawberry_lib PRIVATE dsound dwmapi)
if(MSVC) if(MSVC)
target_link_libraries(strawberry_lib PRIVATE sqlite3) target_link_libraries(strawberry_lib PRIVATE sqlite3)
endif()
if(MSVC)
if (GETOPT_INCLUDE_DIRS) if (GETOPT_INCLUDE_DIRS)
target_include_directories(strawberry_lib SYSTEM PRIVATE ${GETOPT_INCLUDE_DIRS}) target_include_directories(strawberry_lib SYSTEM PRIVATE ${GETOPT_INCLUDE_DIRS})
endif() endif()
@ -1170,6 +1170,11 @@ if(WIN32)
endif() endif()
endif() endif()
if(HAVE_QTSPARKLE)
target_include_directories(strawberry_lib SYSTEM PRIVATE ${QTSPARKLE_INCLUDE_DIRS})
target_link_libraries(strawberry_lib PRIVATE ${QTSPARKLE_LIBRARIES})
endif()
############################################################################### ###############################################################################
set(EXECUTABLE_OUTPUT_PATH ..) set(EXECUTABLE_OUTPUT_PATH ..)