Skip to content

Commit c5690b8

Browse files
committed
cmake: Convert message_trgt function to support varargs.
Add an additional message_XXX function for printing a path [in brackets].
1 parent 4650ebd commit c5690b8

File tree

1 file changed

+28
-29
lines changed

1 file changed

+28
-29
lines changed

mythtv/cmake/PrintConfig.cmake

Lines changed: 28 additions & 29 deletions
Original file line numberDiff line numberDiff line change
@@ -4,39 +4,38 @@
44
# See the file LICENSE_FSF for licensing information.
55
#
66

7-
function(message_trgt _label _target)
7+
function(target_to_yn _target _varname)
88
if(TARGET ${_target})
9-
set(_string yes)
10-
else()
11-
set(_string no)
12-
endif()
13-
if(${ARGC} GREATER 2)
14-
message("${_label} ${_string} [${ARGV2}]")
9+
set(${_varname} "yes" PARENT_SCOPE)
1510
else()
16-
message("${_label} ${_string}")
11+
set(${_varname} "no" PARENT_SCOPE)
1712
endif()
1813
endfunction()
1914

20-
function(message_trg2 _label _target _extra)
21-
if(TARGET ${_target})
22-
set(_string yes)
23-
else()
24-
set(_string no)
15+
function(message_trgt _label _target)
16+
target_to_yn(${_target} _yn)
17+
if (ARGC LESS 3)
18+
message("${_label} ${_yn}")
19+
return()
2520
endif()
26-
message("${_label} ${_string} ${_extra}")
21+
22+
set(_args ${ARGN})
23+
while(_args)
24+
list(POP_FRONT _args _l2 _t2)
25+
target_to_yn(${_t2} _yn2)
26+
list(APPEND _rest "${_l2} ${_yn2}")
27+
endwhile()
28+
list(JOIN _rest ", " _rest)
29+
message("${_label} ${_yn} (${_rest})")
2730
endfunction()
2831

29-
function(message_trg4 _label1 _target1 _label2 _target2)
30-
if(NOT TARGET ${_target1})
31-
message("${_label1} no")
32-
return()
33-
endif()
34-
if(TARGET ${_target2})
35-
set(_string2 yes)
32+
function(message_trgp _label _target)
33+
target_to_yn(${_target} _string)
34+
if(${ARGC} GREATER 2)
35+
message("${_label} ${_yn} [${ARGV2}]")
3636
else()
37-
set(_string12 no)
37+
message("${_label} ${_yn}")
3838
endif()
39-
message("${_label1} yes (${_label2} ${_string2})")
4039
endfunction()
4140

4241
function(message_vrbl _label _vname)
@@ -120,7 +119,7 @@ if(CONFIG_FRONTEND)
120119
message("# Input Support")
121120
message_trgt("Joystick menu " joystick)
122121
message_trgt("lirc support " lirc)
123-
message_trgt("libCEC device support " PkgConfig::LibCEC
122+
message_trgp("libCEC device support " PkgConfig::LibCEC
124123
${LibCEC_INCLUDE_DIRS})
125124
if(APPLE)
126125
message("Apple Remote yes")
@@ -130,7 +129,7 @@ endif()
130129
if(ENABLE_BACKEND)
131130
message_trgt("Video4Linux support " PkgConfig::V4L2)
132131
message_vrbl("FireWire support " ENABLE_FIREWIRE)
133-
message_trgt("DVB support " mythtv_dvb ${DVB_PATH})
132+
message_trgp("DVB support " mythtv_dvb ${DVB_PATH})
134133
message_vrbl("DVB-S2 support " HAVE_FE_CAN_2G_MODULATION)
135134
message_trgt("HDHomeRun support " HDHomerun::HDHomerun)
136135
message_trgt("Sat>IP support " mythtv_satip)
@@ -167,25 +166,25 @@ if(ENABLE_FRONTEND)
167166
if(APPLE)
168167
message_vrbl("VideoToolBox support " APPLE_VIDEOTOOLBOX_LIBRARY)
169168
endif()
170-
message_trgt("VAAPI support " PkgConfig::VAAPI "DRM ${CONFIG_VAAPI_DRM}, GLX ${CONFIG_VAAPI_GLX}, X11 ${CONFIG_VAAPI_X11}")
169+
message_trgt("VAAPI support " PkgConfig::VAAPI "DRM" PkgConfig::VA-DRM "GLX" PkgConfig::VA-GLX "X11" PkgConfig::VA-X11)
171170
message_trgt("DRM support " PkgConfig::DRM)
172171
if(TARGET PkgConfig::DRM)
173172
message_trgt("DRM Qt integration " Qt${QT_VERSION_MAJOR}::GuiPrivate)
174173
endif()
175-
message_trg4("Video4Linux codecs " PkgConfig::V4L2 "DRM" PkgConfig::DRM)
174+
message_trgt("Video4Linux codecs " PkgConfig::V4L2 "DRM" PkgConfig::DRM)
176175
message_trgt("MMAL decoder support " mythtv_mmal)
177176
if(TARGET OpenGL::GL)
178177
message_trgt("OpenGL " OpenGL::GL)
179178
message_trgt("EGL support " OpenGL::EGL)
180179
elseif(TARGET PkgConfig::GLES2)
181-
message_trgt("OpenGL " PkgConfig::GLES2 "GLES")
180+
message_trgt("OpenGL " PkgConfig::GLES2 "GLES" true)
182181
message_trgt("EGL support " PkgConfig::EGL)
183182
endif()
184183
if(WIN32)
185184
message_vrbl("Windows (Direct3D) " HAVE_D3D9_H)
186185
message_vrbl("DXVA2 support " HAVE_DXVA2)
187186
endif()
188-
message_trg4("Vulkan " Vulkan::Vulkan "libglslang"
187+
message_trgt("Vulkan " Vulkan::Vulkan "libglslang"
189188
PkgConfig::GLSLANG)
190189
message_trgt("MHEG support " mythtv_mheg)
191190
message_trgt("libass subtitle support " PkgConfig::LIBASS)

0 commit comments

Comments
 (0)