cmake: Make sure CONFIG_XXX flags are set properly.

The cmake builds were properly building files that depend on these
libraries (a la the old qt pro files) and were linking against these
libraries, but they weren't setting the CONFIG_XXX variables for
conditionally compiled code in other files.  Those variables are now
set properly.  Setting the variables exposed a couple of other
problems where libraries weren't linked (or MOC wasn't invoked).
Those problems are fixed as well.

Author: linuxdude42

cmake/CheckExternalLibraries.cmake

@@ -56,21 +56,21 @@ endif()
 find_package(LibX264 0.118)
 if(ENABLE_X264 AND LibX264_VERSION)
   add_build_config(LibX264::LibX264 "x264")
-  set(HAVE_LIBX264 ${LibX264_FOUND})
+  set(CONFIG_LIBX264 ${LibX264_FOUND})
 endif()
 
 # x265: fedora:x265-devel debian:libx265-dev
 find_package(LibX265)
 if(ENABLE_X265 AND LibX265_VERSION)
   add_build_config(LibX265::LibX265 "x265")
-  set(HAVE_LIBX264 ${LibX264_FOUND})
+  set(CONFIG_LIBX265 ${LibX265_FOUND})
 endif()
 
 # xvid: fedora:xvidcore-devel debian:libxvidcore-dev
 find_package(LibXvid)
 if(ENABLE_XVID AND LibX2vid_VERSION)
   add_build_config(LibXvid::LibXvid "xvid")
-  set(HAVE_LIBXvid ${LibXvid_FOUND})
+  set(CONFIG_LIBXVID ${LibXvid_FOUND})
 endif()
 
 # vpx: fedora:libvpx-devel debian:libvpx-dev
@@ -88,6 +88,7 @@ if(ENABLE_MP3LAME)
   add_build_config(Lame::Lame "libmp3lame")
   target_compile_definitions(Lame::Lame INTERFACE USING_LIBMP3LAME)
   add_library(lame ALIAS Lame::Lame)
+  set(CONFIG_LIBMP3LAME TRUE)
 endif()
 
 # vdpau: fedora:libvdpau-devel debian:libvdpau-dev

cmake/MythFindQt.cmake

@@ -81,6 +81,7 @@ get_target_property(QMAKE_EXECUTABLE ${QT_PKG_NAME}::qmake IMPORTED_LOCATION)
 
 if(TARGET ${QT_PKG_NAME}::DBus)
   target_compile_definitions(${QT_PKG_NAME}::DBus INTERFACE USING_DBUS)
+  set(CONFIG_QTDBUS ON)
 endif()
 
 # Not all of the Qt6 include directories squirrel the private headers away into

mythtv/cmake/MythFindPackages.cmake

@@ -118,6 +118,7 @@ if(ENABLE_BINDINGS_PYTHON)
     message(
       STATUS "Python interperter and modules found. Enbling python bindings.")
     set(USING_BINDINGS_PYTHON TRUE)
+    set(CONFIG_BINDINGS_PYTHON TRUE)
   endif()
 
   # Strip off any minor version on the python executable name.
@@ -178,9 +179,12 @@ endif()
 # (on Fedora) is part of a separate libzip-tools package and may or may not be
 # installed.  Use pkg-config which only cares about the presence of the library.
 #
-# libzip: fedora:libzip-devel debian:libzip-dev:
+# libzip: fedora:libzip-devel debian:libzip-dev
 pkg_check_modules(LIBZIP "libzip" REQUIRED IMPORTED_TARGET)
 
+# liblzo: fedora:lzo-devel debian:liblzo2-dev
+pkg_check_modules(LZO2 "lzo2" REQUIRED IMPORTED_TARGET)
+
 # taglib: fedora:taglib-devel debian:libtag1-dev
 pkg_check_modules(TAGLIB "taglib>=1.11.1" REQUIRED IMPORTED_TARGET)
 add_build_config(PkgConfig::TAGLIB "taglib")
@@ -306,6 +310,7 @@ if(ENABLE_AUDIO_ALSA)
   add_build_config(PkgConfig::ALSA "alsa")
   if(ALSA_FOUND)
     target_compile_definitions(PkgConfig::ALSA INTERFACE USING_ALSA)
+    set(CONFIG_AUDIO_ALSA TRUE)
   endif()
 endif()
 
@@ -315,6 +320,7 @@ if(ENABLE_AUDIO_OSS)
     add_build_config(TRUE "oss")
     add_library(mythtv_oss INTERFACE)
     target_compile_definitions(mythtv_oss INTERFACE USING_OSS)
+    set(CONFIG_AUDIO_OSS TRUE)
   endif()
 endif()
 
@@ -387,6 +393,7 @@ if(ENABLE_LIBDNS_SD)
     if(LIBCRYPTO_FOUND)
       target_compile_definitions(PkgConfig::LIBDNS_SD INTERFACE USING_AIRPLAY)
     endif()
+    set(CONFIG_LIBDNS_SD TRUE)
   endif()
 endif()
 
@@ -397,11 +404,13 @@ if(ENABLE_SYSTEMD_NOTIFY OR ENABLE_SYSTEMD_JOURNAL)
     find_file(SYSTEMD_JOURNALD "systemd/sd-journal.h"
               PATHS ${SYSTEMD_INCLUDE_PATH})
     add_build_config(SYSTEMD_JOURNALD "systemd_journal")
+    set(CONFIG_SYSTEMD_JOURNAL ON)
   endif()
   if(SYSTEMD_FOUND AND ENABLE_SYSTEMD_NOTIFY)
     find_file(SYSTEMD_NOTIFY "systemd/sd-daemon.h"
               PATHS ${SYSTEMD_INCLUDE_PATH})
     add_build_config(SYSTEMD_NOTIFY "systemd_notify")
+    set(CONFIG_SYSTEMD_NOTIFY ON)
   endif()
 endif()
 

mythtv/libs/libmyth/CMakeLists.txt

@@ -109,6 +109,10 @@ if(TARGET PkgConfig::PULSEAUDIO)
 endif()
 if(UNIX)
   target_sources(myth PRIVATE mediamonitor-unix.cpp mediamonitor-unix.h)
+  if(NOT TARGET ${QT_PKG_NAME}::DBus)
+    set_source_files_properties(mediamonitor-unix.h PROPERTIES SKIP_AUTOMOC
+                                                               TRUE)
+  endif()
 endif()
 if(WIN32)
   target_sources(
@@ -147,8 +151,6 @@ endif()
 # All remaining target information
 #
 
-set_source_files_properties(mediamonitor-unix.h PROPERTIES SKIP_AUTOMOC TRUE)
-
 target_compile_definitions(myth PRIVATE MYTH_API)
 
 target_include_directories(

mythtv/libs/libmythtv/CMakeLists.txt

@@ -279,6 +279,7 @@ target_link_libraries(
          PkgConfig::LIBPOSTPROC
          Iconv::Iconv
          $<TARGET_NAME_IF_EXISTS:PkgConfig::LibXml2>
+         $<TARGET_NAME_IF_EXISTS:PkgConfig::SYSTEMD>
          PkgConfig::LIBCRYPTO
          PkgConfig::SoundTouch
          mythbluray

mythtv/libs/libmythtv/cmake/Backend.cmake

@@ -8,6 +8,7 @@ if(NOT ENABLE_BACKEND)
   return()
 endif()
 
+target_link_libraries(mythtv PUBLIC PkgConfig::LZO2)
 target_compile_definitions(mythtv PRIVATE USING_BACKEND USING_IPTV)
 target_sources(
   mythtv
@@ -180,12 +181,12 @@ if(TARGET Lame::Lame)
   if(USING_FFMPEG_THREADS)
     target_compile_definitions(mythtv PRIVATE USING_FFMPEG_THREADS)
   endif()
-  # ~~~
-  # if(NOT mingw AND NOT win32-msvc*)
-  #   target_sources(mythtv PRIVATE
-  #                  recorders/NuppelVideoRecorder.cpp recorders/NuppelVideoRecorder.h)
-  # endif()
-  # ~~~
+
+  if(NOT MINGW AND NOT MSVC)
+    target_sources(mythtv PRIVATE recorders/NuppelVideoRecorder.cpp
+                                  recorders/NuppelVideoRecorder.h)
+  endif()
+  target_link_libraries(mythtv PUBLIC Lame::Lame)
 endif()
 
 # Support for cable boxes that provide Firewire out