diff options
author | Gerald Combs <gerald@wireshark.org> | 2021-07-14 09:10:09 -0700 |
---|---|---|
committer | Gerald Combs <gerald@wireshark.org> | 2021-07-14 09:10:09 -0700 |
commit | 8834b470d04165dea28b37765c1cd8ac50ef760c (patch) | |
tree | c819973d5c1030026d01e7ab428a11cbd07feb5e /cmake/modules | |
parent | 1f9f287fbaea0a16951cefa12cd1626ea1bbb1cd (diff) |
CMake: Fixup SpanDSP's TIFF includes.
Add TIFF_INCLUDE_DIR to SPANDSP_INCLUDE_DIRS, but only if TIFF has been
found.
Ping #17477.
Diffstat (limited to 'cmake/modules')
-rw-r--r-- | cmake/modules/FindSPANDSP.cmake | 6 |
1 files changed, 6 insertions, 0 deletions
diff --git a/cmake/modules/FindSPANDSP.cmake b/cmake/modules/FindSPANDSP.cmake index 70aafc1165..612304c09e 100644 --- a/cmake/modules/FindSPANDSP.cmake +++ b/cmake/modules/FindSPANDSP.cmake @@ -14,6 +14,9 @@ if( NOT WIN32) pkg_search_module(SPANDSP spandsp) endif() +# spandsp.h includes tiffio.h. +find_package(TIFF QUIET) + find_path( SPANDSP_INCLUDE_DIR NAMES spandsp.h HINTS @@ -35,6 +38,9 @@ find_package_handle_standard_args( SPANDSP DEFAULT_MSG SPANDSP_LIBRARY SPANDSP_I if( SPANDSP_FOUND ) set( SPANDSP_INCLUDE_DIRS ${SPANDSP_INCLUDE_DIR} ) + if( TIFF_FOUND ) + list(APPEND SPANDSP_INCLUDE_DIRS ${TIFF_INCLUDE_DIR}) + endif() set( SPANDSP_LIBRARIES ${SPANDSP_LIBRARY} ) if (WIN32) set ( SPANDSP_DLL_DIR "${SPANDSP_HINTS}/bin" |