dryark/strawberry
2
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Add SYSTEM to system includes in target_include_directories

Browse Source
This commit is contained in:
Jonas Kvinge
2020-06-26 23:26:04 +02:00
parent b51cc21140
commit 837ae2932f
6 changed files with 53 additions and 36 deletions
Download Patch File Download Diff File Expand all files Collapse all files

47
src/CMakeLists.txt
View File

@@ -1001,6 +1001,17 @@ add_library(strawberry_lib STATIC
${OTHER_UIC_SOURCES}
)
target_include_directories(strawberry_lib SYSTEM PUBLIC
${Boost_INCLUDE_DIRS}
${GLIB_INCLUDE_DIRS}
${GOBJECT_INCLUDE_DIRS}
${GNUTLS_INCLUDE_DIRS}
${SQLITE_INCLUDE_DIRS}
${QT_INCLUDE_DIRS}
${SINGLEAPPLICATION_INCLUDE_DIRS}
${SINGLECOREAPPLICATION_INCLUDE_DIRS}
)
target_include_directories(strawberry_lib PUBLIC
${CMAKE_SOURCE_DIR}
${CMAKE_BINARY_DIR}
@@ -1009,15 +1020,7 @@ target_include_directories(strawberry_lib PUBLIC
${CMAKE_SOURCE_DIR}/ext/libstrawberry-common
${CMAKE_SOURCE_DIR}/ext/libstrawberry-tagreader
${CMAKE_BINARY_DIR}/ext/libstrawberry-tagreader
${Boost_INCLUDE_DIRS}
${GLIB_INCLUDE_DIRS}
${GOBJECT_INCLUDE_DIRS}
${GNUTLS_INCLUDE_DIRS}
${SQLITE_INCLUDE_DIRS}
${TAGLIB_INCLUDE_DIRS}
${QT_INCLUDE_DIRS}
${SINGLEAPPLICATION_INCLUDE_DIRS}
${SINGLECOREAPPLICATION_INCLUDE_DIRS}
)
target_link_libraries(strawberry_lib PUBLIC
@@ -1035,17 +1038,17 @@ target_link_libraries(strawberry_lib PUBLIC
)
if(HAVE_ALSA)
target_include_directories(strawberry_lib PRIVATE ${ALSA_INCLUDE_DIRS})
target_include_directories(strawberry_lib SYSTEM PRIVATE ${ALSA_INCLUDE_DIRS})
target_link_libraries(strawberry_lib PRIVATE ${ALSA_LIBRARIES})
endif(HAVE_ALSA)
if(HAVE_LIBPULSE)
target_include_directories(strawberry_lib PRIVATE ${LIBPULSE_INCLUDE_DIRS})
target_include_directories(strawberry_lib SYSTEM PRIVATE ${LIBPULSE_INCLUDE_DIRS})
target_link_libraries(strawberry_lib PRIVATE ${LIBPULSE_LIBRARIES})
endif()
if(HAVE_GSTREAMER)
target_include_directories(strawberry_lib PRIVATE
target_include_directories(strawberry_lib SYSTEM PRIVATE
${GSTREAMER_INCLUDE_DIRS}
${GSTREAMER_BASE_INCLUDE_DIRS}
${GSTREAMER_APP_INCLUDE_DIRS}
@@ -1068,52 +1071,52 @@ if(HAVE_MOODBAR)
endif()
if(HAVE_XINE)
target_include_directories(strawberry_lib PRIVATE ${LIBXINE_INCLUDE_DIRS})
target_include_directories(strawberry_lib SYSTEM PRIVATE ${LIBXINE_INCLUDE_DIRS})
target_link_libraries(strawberry_lib PRIVATE ${LIBXINE_LIBRARIES})
endif()
if(HAVE_VLC)
target_include_directories(strawberry_lib PRIVATE ${LIBVLC_INCLUDE_DIRS})
target_include_directories(strawberry_lib SYSTEM PRIVATE ${LIBVLC_INCLUDE_DIRS})
target_link_libraries(strawberry_lib PRIVATE ${LIBVLC_LIBRARIES})
endif()
if(HAVE_CHROMAPRINT)
target_include_directories(strawberry_lib PRIVATE ${CHROMAPRINT_INCLUDE_DIRS})
target_include_directories(strawberry_lib SYSTEM PRIVATE ${CHROMAPRINT_INCLUDE_DIRS})
target_link_libraries(strawberry_lib PRIVATE ${CHROMAPRINT_LIBRARIES})
endif(HAVE_CHROMAPRINT)
if(X11_FOUND)
target_include_directories(strawberry_lib PRIVATE ${X11_INCLUDE_DIR})
target_include_directories(strawberry_lib SYSTEM PRIVATE ${X11_INCLUDE_DIR})
target_link_libraries(strawberry_lib PRIVATE ${X11_LIBRARIES})
endif(X11_FOUND)
if(XCB_FOUND)
target_include_directories(strawberry_lib PRIVATE ${XCB_INCLUDE_DIR})
target_include_directories(strawberry_lib SYSTEM PRIVATE ${XCB_INCLUDE_DIR})
target_link_libraries(strawberry_lib PRIVATE ${XCB_LIBRARIES})
endif(XCB_FOUND)
if(HAVE_GIO)
target_include_directories(strawberry_lib PRIVATE ${GIO_INCLUDE_DIRS})
target_include_directories(strawberry_lib SYSTEM PRIVATE ${GIO_INCLUDE_DIRS})
target_link_libraries(strawberry_lib PRIVATE ${GIO_LIBRARIES})
endif(HAVE_GIO)
if(HAVE_AUDIOCD)
target_include_directories(strawberry_lib PRIVATE ${LIBCDIO_INCLUDE_DIRS})
target_include_directories(strawberry_lib SYSTEM PRIVATE ${LIBCDIO_INCLUDE_DIRS})
target_link_libraries(strawberry_lib PRIVATE ${LIBCDIO_LIBRARIES})
endif(HAVE_AUDIOCD)
if(HAVE_LIBGPOD)
target_include_directories(strawberry_lib PRIVATE ${LIBGPOD_INCLUDE_DIRS})
target_include_directories(strawberry_lib SYSTEM PRIVATE ${LIBGPOD_INCLUDE_DIRS})
target_link_libraries(strawberry_lib PRIVATE ${LIBGPOD_LIBRARIES})
endif(HAVE_LIBGPOD)
if(HAVE_LIBMTP)
target_include_directories(strawberry_lib PRIVATE ${LIBMTP_INCLUDE_DIRS})
target_include_directories(strawberry_lib SYSTEM PRIVATE ${LIBMTP_INCLUDE_DIRS})
target_link_libraries(strawberry_lib PRIVATE ${LIBMTP_LIBRARIES})
endif(HAVE_LIBMTP)
if(HAVE_IMOBILEDEVICE)
target_include_directories(strawberry_lib PRIVATE
target_include_directories(strawberry_lib SYSTEM PRIVATE
${LIBUSBMUXD_INCLUDE_DIRS}
${LIBPLIST_INCLUDE_DIRS}
${LIBIMOBILEDEVICE_INCLUDE_DIRS}
@@ -1137,7 +1140,7 @@ if(APPLE)
"-framework ScriptingBridge"
)
if(HAVE_SPARKLE)
target_include_directories(strawberry_lib PRIVATE ${SPARKLE}/Headers)
target_include_directories(strawberry_lib SYSTEM PRIVATE ${SPARKLE}/Headers)
target_link_libraries(strawberry_lib PRIVATE ${SPARKLE})
endif(HAVE_SPARKLE)
endif(APPLE)