Merge pull request #11147 from daschuer/cmake_versions_main

Report versions of found library during cmake configure (main) 

5 files changed, 64 insertions, 26 deletions

diff --git a/cmake/modules/FindJACK.cmake b/cmake/modules/FindJACK.cmake
index dfd2b0dad3..62f743aa49 100644
--- a/cmake/modules/FindJACK.cmake
+++ b/cmake/modules/FindJACK.cmake
@@ -24,17 +24,21 @@ This module provides the following imported targets, if found:
 find_package(PkgConfig QUIET)
 if(PkgConfig_FOUND)
   pkg_check_modules(JACK jack)
-else()
-  find_library(JACK_LINK_LIBRARIES
-    NAMES jack
-    DOC "JACK library"
-  )
-  find_path(JACK_INCLUDEDIR
-    NAMES jack/jack.h
-    DOC "JACK header"
-  )
 endif()
 
+find_path(JACK_INCLUDE_DIR
+  NAMES jack/jack.h
+  PATHS ${PC_JACK_INCLUDE_DIRS}
+  DOC "JACK include directory")
+mark_as_advanced(JACK_INCLUDE_DIR)
+
+find_library(JACK_LIBRARY
+  NAMES jack
+  PATHS ${PC_JACK_LIBRARY_DIRS}
+  DOC "JACK library"
+)
+mark_as_advanced(JACK_LIBRARY)
+
 if(WIN32)
     # vcpkg provides CMake targets for pthreads4w
     # This won't work if pthreads4w was built without vcpkg.
@@ -42,16 +46,30 @@ if(WIN32)
     list(APPEND JACK_LINK_LIBRARIES PThreads4W::PThreads4W)
 endif()
 
+if(DEFINED PC_JACK_VERSION AND NOT PC_JACK_VERSION STREQUAL "")
+  set(JACK_VERSION "${PC_JACK_VERSION}")
+endif()
+
 include(FindPackageHandleStandardArgs)
 find_package_handle_standard_args(
   JACK
-  DEFAULT_MSG
-  JACK_LINK_LIBRARIES
-  JACK_INCLUDEDIR
+  REQUIRED_VARS JACK_LIBRARY JACK_INCLUDE_DIR
+  VERSION_VAR JACK_VERSION
+
 )
 
-if(JACK_FOUND AND NOT TARGET JACK::jack)
-  add_library(JACK::jack INTERFACE IMPORTED)
-  target_link_libraries(JACK::jack INTERFACE "${JACK_LINK_LIBRARIES}")
-  target_include_directories(JACK::jack INTERFACE "${JACK_INCLUDEDIR}")
+if(JACK_FOUND)
+  set(JACK_LIBRARIES "${JACK_LIBRARY}")
+  set(JACK_INCLUDE_DIRS "${JACK_INCLUDE_DIR}")
+  set(JACK_DEFINITIONS ${PC_JACK_CFLAGS_OTHER})
+
+  if(NOT TARGET JACK::jack)
+  add_library(JACK::jack UNKNOWN IMPORTED)
+    set_target_properties(JACK::jack
+      PROPERTIES
+        IMPORTED_LOCATION "${JACK_LIBRARY}"
+        INTERFACE_COMPILE_OPTIONS "${PC_JACK_CFLAGS_OTHER}"
+        INTERFACE_INCLUDE_DIRECTORIES "${JACK_INCLUDE_DIR}"
+    )
+  endif()
 endif()
diff --git a/cmake/modules/FindOpus.cmake b/cmake/modules/FindOpus.cmake
index 70e93e31b5..2c01eb3b44 100644
--- a/cmake/modules/FindOpus.cmake
+++ b/cmake/modules/FindOpus.cmake
@@ -53,12 +53,15 @@ find_library(Opus_LIBRARY
 )
 mark_as_advanced(Opus_LIBRARY)
 
+if(DEFINED PC_Opus_VERSION AND NOT PC_Opus_VERSION STREQUAL "")
+  set(Opus_VERSION "${PC_Opus_VERSION}")
+endif()
+
 include(FindPackageHandleStandardArgs)
 find_package_handle_standard_args(
   Opus
-  DEFAULT_MSG
-  Opus_LIBRARY
-  Opus_INCLUDE_DIR
+  REQUIRED_VARS Opus_LIBRARY Opus_INCLUDE_DIR
+  VERSION_VAR Opus_VERSION
 )
 
 if(Opus_FOUND)
diff --git a/cmake/modules/FindOpusFile.cmake b/cmake/modules/FindOpusFile.cmake
index f9f84382d6..973a6be3d9 100644
--- a/cmake/modules/FindOpusFile.cmake
+++ b/cmake/modules/FindOpusFile.cmake
@@ -60,12 +60,15 @@ find_library(OpusFile_LIBRARY
 )
 mark_as_advanced(OpusFile_LIBRARY)
 
+if(DEFINED PC_OpusFile_VERSION AND NOT PC_OpusFile_VERSION STREQUAL "")
+  set(OpusFile_VERSION "${PC_OpusFile_VERSION}")
+endif()
+
 include(FindPackageHandleStandardArgs)
 find_package_handle_standard_args(
   OpusFile
-  DEFAULT_MSG
-  OpusFile_LIBRARY
-  OpusFile_INCLUDE_DIR
+  REQUIRED_VARS OpusFile_LIBRARY OpusFile_INCLUDE_DIR
+  VERSION_VAR OpusFile_VERSION
 )
 
 if(OpusFile_FOUND)
diff --git a/cmake/modules/FindPortAudio.cmake b/cmake/modules/FindPortAudio.cmake
index 55c28736b6..3c0a8b5c8f 100644
--- a/cmake/modules/FindPortAudio.cmake
+++ b/cmake/modules/FindPortAudio.cmake
@@ -67,12 +67,15 @@ find_library(PortAudio_LIBRARY
 )
 mark_as_advanced(PortAudio_LIBRARY)
 
+if(DEFINED PC_PortAudio_VERSION AND NOT PC_PortAudio_VERSION STREQUAL "")
+  set(PortAudio_VERSION "${PC_PortAudio_VERSION}")
+endif()
+
 include(FindPackageHandleStandardArgs)
 find_package_handle_standard_args(
   PortAudio
-  DEFAULT_MSG
-  PortAudio_LIBRARY
-  PortAudio_INCLUDE_DIR
+  REQUIRED_VARS PortAudio_LIBRARY PortAudio_INCLUDE_DIR
+  VERSION_VAR PortAudio_VERSION
 )
 
 if(PortAudio_FOUND)
diff --git a/cmake/modules/FindTagLib.cmake b/cmake/modules/FindTagLib.cmake
index e07fc98b6d..be311a9f01 100644
--- a/cmake/modules/FindTagLib.cmake
+++ b/cmake/modules/FindTagLib.cmake
@@ -64,8 +64,19 @@ find_library(TagLib_LIBRARY
 )
 mark_as_advanced(TagLib_LIBRARY)
 
+if(DEFINED PC_TagLib_VERSION AND NOT PC_TagLib_VERSION STREQUAL "")
+  set(TagLib_VERSION "${PC_TagLib_VERSION}")
+endif()
+
+include(FindPackageHandleStandardArgs)
+find_package_handle_standard_args(
+  TagLib
+  REQUIRED_VARS TagLib_LIBRARY TagLib_INCLUDE_DIR
+  VERSION_VAR TagLib_VERSION
+)
+
 # Version detection
-if(PC_TagLib_VERSION)
+if(DEFINED PC_TagLib_VERSION AND NOT PC_TagLib_VERSION STREQUAL "")
   set(TagLib_VERSION "${PC_TagLib_VERSION}")
 else()
   if (EXISTS "${TagLib_INCLUDE_DIR}/taglib.h")