sync with upstreamMatrix

1 files changed, 10 insertions, 2 deletions

diff --git a/cmake/modules/FindCdio.cmake b/cmake/modules/FindCdio.cmake
index 465ecc6..3a10b06 100644
--- a/cmake/modules/FindCdio.cmake
+++ b/cmake/modules/FindCdio.cmake
@@ -11,6 +11,7 @@
 
 if(PKG_CONFIG_FOUND)
   pkg_check_modules(PC_CDIO libcdio>=0.80 QUIET)
+  pkg_check_modules(PC_CDIOPP libcdio++>=2.1.0 QUIET)
 endif()
 
 find_path(CDIO_INCLUDE_DIR NAMES cdio/cdio.h
@@ -19,7 +20,14 @@ find_path(CDIO_INCLUDE_DIR NAMES cdio/cdio.h
 find_library(CDIO_LIBRARY NAMES cdio libcdio
                           PATHS ${PC_CDIO_LIBDIR})
 
-set(CDIO_VERSION ${PC_CDIO_VERSION})
+if(DEFINED PC_CDIO_VERSION AND DEFINED PC_CDIOPP_VERSION AND NOT "${PC_CDIO_VERSION}" VERSION_EQUAL "${PC_CDIOPP_VERSION}")
+  message(WARNING "Detected libcdio (${PC_CDIO_VERSION}) and libcdio++ (${PC_CDIOPP_VERSION}) version mismatch. libcdio++ will not be used.")
+else()
+  find_path(CDIOPP_INCLUDE_DIR NAMES cdio++/cdio.hpp
+                               PATHS ${PC_CDIOPP_INCLUDEDIR} ${CDIO_INCLUDE_DIR})
+
+  set(CDIO_VERSION ${PC_CDIO_VERSION})
+endif()
 
 include(FindPackageHandleStandardArgs)
 find_package_handle_standard_args(Cdio
@@ -31,4 +39,4 @@ if(CDIO_FOUND)
   set(CDIO_INCLUDE_DIRS ${CDIO_INCLUDE_DIR})
 endif()
 
-mark_as_advanced(CDIO_INCLUDE_DIR CDIO_LIBRARY)
+mark_as_advanced(CDIO_INCLUDE_DIR CDIOPP_INCLUDE_DIR CDIO_LIBRARY)