From 3cb8aa05f8cee9e860cf83531682ff0ed4af6a4f Mon Sep 17 00:00:00 2001 From: manuel Date: Thu, 4 Mar 2021 23:36:40 +0100 Subject: sync with upstream --- cmake/modules/FindIso9660pp.cmake | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) (limited to 'cmake/modules/FindIso9660pp.cmake') diff --git a/cmake/modules/FindIso9660pp.cmake b/cmake/modules/FindIso9660pp.cmake index 5f84b55..f98273b 100644 --- a/cmake/modules/FindIso9660pp.cmake +++ b/cmake/modules/FindIso9660pp.cmake @@ -15,6 +15,8 @@ if(PKG_CONFIG_FOUND) pkg_check_modules(PC_ISO9660 libiso9660>=2.1.0 QUIET) endif() +find_package(Cdio) + find_path(ISO9660PP_INCLUDE_DIR NAMES cdio++/iso9660.hpp PATHS ${PC_ISO9660PP_INCLUDEDIR}) @@ -31,12 +33,12 @@ set(ISO9660PP_VERSION ${PC_ISO9660PP_VERSION}) include(FindPackageHandleStandardArgs) find_package_handle_standard_args(Iso9660pp - REQUIRED_VARS ISO9660PP_LIBRARY ISO9660PP_INCLUDE_DIR ISO9660_LIBRARY ISO9660_INCLUDE_DIR + REQUIRED_VARS ISO9660PP_LIBRARY ISO9660PP_INCLUDE_DIR ISO9660_LIBRARY ISO9660_INCLUDE_DIR CDIO_LIBRARY CDIO_INCLUDE_DIR CDIOPP_INCLUDE_DIR VERSION_VAR ISO9660PP_VERSION) if(ISO9660PP_FOUND) - set(ISO9660PP_LIBRARIES ${ISO9660PP_LIBRARY} ${ISO9660_LIBRARY}) - set(ISO9660PP_INCLUDE_DIRS ${ISO9660PP_INCLUDE_DIR} ${ISO9660_INCLUDE_DIR}) + set(ISO9660PP_LIBRARIES ${ISO9660PP_LIBRARY} ${ISO9660_LIBRARY} ${CDIO_LIBRARY}) + set(ISO9660PP_INCLUDE_DIRS ${CDIO_INCLUDE_DIR} ${CDIOPP_INCLUDE_DIR} ${ISO9660_INCLUDE_DIR} ${ISO9660PP_INCLUDE_DIR}) set(ISO9660PP_DEFINITIONS -DHAS_ISO9660PP=1) endif() -- cgit v1.2.3