From b94e960d253e5889a859f737120340d2da242bc2 Mon Sep 17 00:00:00 2001 From: Arthus Date: Thu, 14 Apr 2022 17:23:49 -0400 Subject: [PATCH] cmake: Rename variable in FindPipeWire for clarity PIPEWIRE_DEFINITIONS contains ready-to-use compile flags. If used with INTERFACE_COMPILE_DEFINITIONS, this can lead to a compile error. Rename the variable to PIPEWIRE_COMPILE_FLAGS to be clear about that and prevent accidental misuse. --- cmake/Modules/FindPipeWire.cmake | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/cmake/Modules/FindPipeWire.cmake b/cmake/Modules/FindPipeWire.cmake index 6fa848895..29bf7f433 100644 --- a/cmake/Modules/FindPipeWire.cmake +++ b/cmake/Modules/FindPipeWire.cmake @@ -10,8 +10,8 @@ # be passed to target_link_libraries() instead of the ``PipeWire::PipeWire`` # target ``PIPEWIRE_INCLUDE_DIRS`` This should be passed to # target_include_directories() if the target is not used for linking -# ``PIPEWIRE_DEFINITIONS`` This should be passed to target_compile_options() if -# the target is not used for linking +# ``PIPEWIRE_COMPILE_FLAGS`` This should be passed to target_compile_options() +# if the target is not used for linking # # If ``PIPEWIRE_FOUND`` is TRUE, it will also define the following imported # target: @@ -56,7 +56,7 @@ find_package(PkgConfig QUIET) pkg_search_module(PKG_PIPEWIRE QUIET libpipewire-0.3) pkg_search_module(PKG_SPA QUIET libspa-0.2) -set(PIPEWIRE_DEFINITIONS "${PKG_PIPEWIRE_CFLAGS}" "${PKG_SPA_CFLAGS}") +set(PIPEWIRE_COMPILE_FLAGS "${PKG_PIPEWIRE_CFLAGS}" "${PKG_SPA_CFLAGS}") set(PIPEWIRE_VERSION "${PKG_PIPEWIRE_VERSION}") find_path( @@ -86,7 +86,7 @@ if(PIPEWIRE_FOUND AND NOT TARGET PipeWire::PipeWire) set_target_properties( PipeWire::PipeWire PROPERTIES IMPORTED_LOCATION "${PIPEWIRE_LIBRARIES}" - INTERFACE_COMPILE_OPTIONS "${PIPEWIRE_DEFINITIONS}" + INTERFACE_COMPILE_OPTIONS "${PIPEWIRE_COMPILE_FLAGS}" INTERFACE_INCLUDE_DIRECTORIES "${PIPEWIRE_INCLUDE_DIRS};${SPA_INCLUDE_DIRS}") endif()