diff --git a/cmake/FindTaglib.cmake b/cmake/FindTaglib.cmake --- a/cmake/FindTaglib.cmake +++ b/cmake/FindTaglib.cmake @@ -53,7 +53,10 @@ exec_program(${TAGLIBCONFIG_EXECUTABLE} ARGS --libs RETURN_VALUE _return_VALUE OUTPUT_VARIABLE TAGLIB_LIBRARIES) exec_program(${TAGLIBCONFIG_EXECUTABLE} ARGS --cflags RETURN_VALUE _return_VALUE OUTPUT_VARIABLE TAGLIB_CFLAGS) - string(REGEX REPLACE " *-I" ";" TAGLIB_INCLUDES "${TAGLIB_CFLAGS}") + + # Assume software will include by things like #include instead of + string(REPLACE "/taglib" "" TAGLIB_STRIPPED_INCLUDE_PATHS "${TAGLIB_CFLAGS}") + string(REGEX REPLACE " *-I" ";" TAGLIB_INCLUDES "${TAGLIB_STRIPPED_INCLUDE_PATHS}") include(FindPackageHandleStandardArgs) find_package_handle_standard_args(Taglib FOUND_VAR TAGLIB_FOUND diff --git a/thumbnail/CMakeLists.txt b/thumbnail/CMakeLists.txt --- a/thumbnail/CMakeLists.txt +++ b/thumbnail/CMakeLists.txt @@ -219,6 +219,7 @@ if(TAGLIB_FOUND) set(audiothumbnail_SRCS audiocreator.cpp) add_library(audiothumbnail MODULE ${audiothumbnail_SRCS}) + target_include_directories(audiothumbnail BEFORE PRIVATE ${TAGLIB_INCLUDES}) target_link_libraries(audiothumbnail ${TAGLIB_LIBRARIES} KF5::KIOWidgets) install(TARGETS audiothumbnail DESTINATION ${PLUGIN_INSTALL_DIR}) set(audiothumbnail_desktop audiothumbnail.desktop)