From 046c46598994f71b721dd2185a1e71945fe8adab Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Fran=C3=A7ois=20Andriot?= Date: Fri, 13 Oct 2017 17:27:24 +0200 Subject: cmake: Fix detection on cdda include files MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: François Andriot (cherry picked from commit f0f2d8725be5a35c448e2a85707086818f7a93e6) --- ConfigureChecks.cmake | 2 ++ mpeglib/example/cddaplay/CMakeLists.txt | 1 + mpeglib/example/mpgplay/CMakeLists.txt | 1 + mpeglib/example/splay/CMakeLists.txt | 1 + mpeglib/example/tplay/CMakeLists.txt | 1 + mpeglib/example/yaf/yafcdda/CMakeLists.txt | 1 + mpeglib/example/yaf/yafmpgplay/CMakeLists.txt | 1 + mpeglib/example/yaf/yafsplay/CMakeLists.txt | 1 + mpeglib/example/yaf/yaftplay/CMakeLists.txt | 1 + mpeglib/example/yaf/yafvorbis/CMakeLists.txt | 1 + mpeglib/example/yaf/yafxplayer/CMakeLists.txt | 1 + mpeglib/example/yaf/yafyuv/CMakeLists.txt | 1 + mpeglib/lib/decoder/CMakeLists.txt | 1 + mpeglib/lib/input/CMakeLists.txt | 1 + mpeglib/lib/mpegplay/CMakeLists.txt | 1 + mpeglib/lib/mpgplayer/CMakeLists.txt | 1 + mpeglib/lib/yuv/CMakeLists.txt | 1 + mpeglib_artsplug/CMakeLists.txt | 1 + tdeioslave/audiocd/CMakeLists.txt | 1 + tdeioslave/audiocd/plugins/wav/CMakeLists.txt | 1 + 20 files changed, 21 insertions(+) diff --git a/ConfigureChecks.cmake b/ConfigureChecks.cmake index a7f72d95..ca404b8f 100644 --- a/ConfigureChecks.cmake +++ b/ConfigureChecks.cmake @@ -190,6 +190,7 @@ if( WITH_CDPARANOIA ) CDPARANOIA_INCLUDE_DIR ) if( CDPARANOIA_FOUND ) + tde_save_and_set( CMAKE_REQUIRED_INCLUDES ${CDPARANOIA_INCLUDE_DIR} ) check_c_source_compiles( " #include int main() { @@ -198,6 +199,7 @@ if( WITH_CDPARANOIA ) return 0; }" CDPARANOIA_DEVICE_NAME ) + tde_restore( CMAKE_REQUIRED_INCLUDES ) if( NOT CDPARANOIA_DEVICE_NAME ) tde_message_fatal( "CDParanoia is too old and can not be used" ) endif( ) diff --git a/mpeglib/example/cddaplay/CMakeLists.txt b/mpeglib/example/cddaplay/CMakeLists.txt index 1ffecb0e..afa24158 100644 --- a/mpeglib/example/cddaplay/CMakeLists.txt +++ b/mpeglib/example/cddaplay/CMakeLists.txt @@ -15,6 +15,7 @@ include_directories( ${CMAKE_BINARY_DIR} ${TQT_INCLUDE_DIRS} ${TDE_INCLUDE_DIR} + ${CDPARANOIA_INCLUDE_DIR} ) link_directories( diff --git a/mpeglib/example/mpgplay/CMakeLists.txt b/mpeglib/example/mpgplay/CMakeLists.txt index 7ef2188c..9beea85a 100644 --- a/mpeglib/example/mpgplay/CMakeLists.txt +++ b/mpeglib/example/mpgplay/CMakeLists.txt @@ -15,6 +15,7 @@ include_directories( ${CMAKE_BINARY_DIR} ${TQT_INCLUDE_DIRS} ${TDE_INCLUDE_DIR} + ${CDPARANOIA_INCLUDE_DIR} ) link_directories( diff --git a/mpeglib/example/splay/CMakeLists.txt b/mpeglib/example/splay/CMakeLists.txt index d7292f79..fd5ab9d7 100644 --- a/mpeglib/example/splay/CMakeLists.txt +++ b/mpeglib/example/splay/CMakeLists.txt @@ -15,6 +15,7 @@ include_directories( ${CMAKE_BINARY_DIR} ${TQT_INCLUDE_DIRS} ${TDE_INCLUDE_DIR} + ${CDPARANOIA_INCLUDE_DIR} ) link_directories( diff --git a/mpeglib/example/tplay/CMakeLists.txt b/mpeglib/example/tplay/CMakeLists.txt index 06f25e99..eba94759 100644 --- a/mpeglib/example/tplay/CMakeLists.txt +++ b/mpeglib/example/tplay/CMakeLists.txt @@ -15,6 +15,7 @@ include_directories( ${CMAKE_BINARY_DIR} ${TQT_INCLUDE_DIRS} ${TDE_INCLUDE_DIR} + ${CDPARANOIA_INCLUDE_DIR} ) link_directories( diff --git a/mpeglib/example/yaf/yafcdda/CMakeLists.txt b/mpeglib/example/yaf/yafcdda/CMakeLists.txt index 5579f599..8d901129 100644 --- a/mpeglib/example/yaf/yafcdda/CMakeLists.txt +++ b/mpeglib/example/yaf/yafcdda/CMakeLists.txt @@ -13,6 +13,7 @@ include_directories( ${CMAKE_BINARY_DIR} ${TQT_INCLUDE_DIRS} ${TDE_INCLUDE_DIR} + ${CDPARANOIA_INCLUDE_DIR} ) link_directories( diff --git a/mpeglib/example/yaf/yafmpgplay/CMakeLists.txt b/mpeglib/example/yaf/yafmpgplay/CMakeLists.txt index 5692823d..072f1241 100644 --- a/mpeglib/example/yaf/yafmpgplay/CMakeLists.txt +++ b/mpeglib/example/yaf/yafmpgplay/CMakeLists.txt @@ -13,6 +13,7 @@ include_directories( ${CMAKE_BINARY_DIR} ${TQT_INCLUDE_DIRS} ${TDE_INCLUDE_DIR} + ${CDPARANOIA_INCLUDE_DIR} ) link_directories( diff --git a/mpeglib/example/yaf/yafsplay/CMakeLists.txt b/mpeglib/example/yaf/yafsplay/CMakeLists.txt index 78509009..726513fa 100644 --- a/mpeglib/example/yaf/yafsplay/CMakeLists.txt +++ b/mpeglib/example/yaf/yafsplay/CMakeLists.txt @@ -13,6 +13,7 @@ include_directories( ${CMAKE_BINARY_DIR} ${TQT_INCLUDE_DIRS} ${TDE_INCLUDE_DIR} + ${CDPARANOIA_INCLUDE_DIR} ) link_directories( diff --git a/mpeglib/example/yaf/yaftplay/CMakeLists.txt b/mpeglib/example/yaf/yaftplay/CMakeLists.txt index eeb05ea8..bd602306 100644 --- a/mpeglib/example/yaf/yaftplay/CMakeLists.txt +++ b/mpeglib/example/yaf/yaftplay/CMakeLists.txt @@ -13,6 +13,7 @@ include_directories( ${CMAKE_BINARY_DIR} ${TQT_INCLUDE_DIRS} ${TDE_INCLUDE_DIR} + ${CDPARANOIA_INCLUDE_DIR} ) link_directories( diff --git a/mpeglib/example/yaf/yafvorbis/CMakeLists.txt b/mpeglib/example/yaf/yafvorbis/CMakeLists.txt index bc223991..6bf7bed5 100644 --- a/mpeglib/example/yaf/yafvorbis/CMakeLists.txt +++ b/mpeglib/example/yaf/yafvorbis/CMakeLists.txt @@ -13,6 +13,7 @@ include_directories( ${CMAKE_BINARY_DIR} ${TQT_INCLUDE_DIRS} ${TDE_INCLUDE_DIR} + ${CDPARANOIA_INCLUDE_DIR} ) link_directories( diff --git a/mpeglib/example/yaf/yafxplayer/CMakeLists.txt b/mpeglib/example/yaf/yafxplayer/CMakeLists.txt index 95f2c5b3..6763265b 100644 --- a/mpeglib/example/yaf/yafxplayer/CMakeLists.txt +++ b/mpeglib/example/yaf/yafxplayer/CMakeLists.txt @@ -13,6 +13,7 @@ include_directories( ${CMAKE_BINARY_DIR} ${TQT_INCLUDE_DIRS} ${TDE_INCLUDE_DIR} + ${CDPARANOIA_INCLUDE_DIR} ) link_directories( diff --git a/mpeglib/example/yaf/yafyuv/CMakeLists.txt b/mpeglib/example/yaf/yafyuv/CMakeLists.txt index 37c6b622..7bfb1626 100644 --- a/mpeglib/example/yaf/yafyuv/CMakeLists.txt +++ b/mpeglib/example/yaf/yafyuv/CMakeLists.txt @@ -13,6 +13,7 @@ include_directories( ${CMAKE_BINARY_DIR} ${TQT_INCLUDE_DIRS} ${TDE_INCLUDE_DIR} + ${CDPARANOIA_INCLUDE_DIR} ) link_directories( diff --git a/mpeglib/lib/decoder/CMakeLists.txt b/mpeglib/lib/decoder/CMakeLists.txt index eb1371a9..a77ff51d 100644 --- a/mpeglib/lib/decoder/CMakeLists.txt +++ b/mpeglib/lib/decoder/CMakeLists.txt @@ -13,6 +13,7 @@ include_directories( ${CMAKE_BINARY_DIR} ${TQT_INCLUDE_DIRS} ${TDE_INCLUDE_DIR} + ${CDPARANOIA_INCLUDE_DIR} ) link_directories( diff --git a/mpeglib/lib/input/CMakeLists.txt b/mpeglib/lib/input/CMakeLists.txt index 37e1f539..8e17e901 100644 --- a/mpeglib/lib/input/CMakeLists.txt +++ b/mpeglib/lib/input/CMakeLists.txt @@ -13,6 +13,7 @@ include_directories( ${CMAKE_BINARY_DIR} ${TQT_INCLUDE_DIRS} ${TDE_INCLUDE_DIR} + ${CDPARANOIA_INCLUDE_DIR} ) link_directories( diff --git a/mpeglib/lib/mpegplay/CMakeLists.txt b/mpeglib/lib/mpegplay/CMakeLists.txt index 2ae612bb..90049818 100644 --- a/mpeglib/lib/mpegplay/CMakeLists.txt +++ b/mpeglib/lib/mpegplay/CMakeLists.txt @@ -13,6 +13,7 @@ include_directories( ${CMAKE_BINARY_DIR} ${TQT_INCLUDE_DIRS} ${TDE_INCLUDE_DIR} + ${CDPARANOIA_INCLUDE_DIR} ) link_directories( diff --git a/mpeglib/lib/mpgplayer/CMakeLists.txt b/mpeglib/lib/mpgplayer/CMakeLists.txt index 4f5db11b..0083518a 100644 --- a/mpeglib/lib/mpgplayer/CMakeLists.txt +++ b/mpeglib/lib/mpgplayer/CMakeLists.txt @@ -13,6 +13,7 @@ include_directories( ${CMAKE_BINARY_DIR} ${TQT_INCLUDE_DIRS} ${TDE_INCLUDE_DIR} + ${CDPARANOIA_INCLUDE_DIR} ) link_directories( diff --git a/mpeglib/lib/yuv/CMakeLists.txt b/mpeglib/lib/yuv/CMakeLists.txt index ba551fc1..f8241353 100644 --- a/mpeglib/lib/yuv/CMakeLists.txt +++ b/mpeglib/lib/yuv/CMakeLists.txt @@ -13,6 +13,7 @@ include_directories( ${CMAKE_BINARY_DIR} ${TQT_INCLUDE_DIRS} ${TDE_INCLUDE_DIR} + ${CDPARANOIA_INCLUDE_DIR} ) link_directories( diff --git a/mpeglib_artsplug/CMakeLists.txt b/mpeglib_artsplug/CMakeLists.txt index 61ad25d4..3a9fbd8c 100644 --- a/mpeglib_artsplug/CMakeLists.txt +++ b/mpeglib_artsplug/CMakeLists.txt @@ -18,6 +18,7 @@ include_directories( ${ARTSC_INCLUDE_DIRS} ${TQT_INCLUDE_DIRS} ${TDE_INCLUDE_DIR} + ${CDPARANOIA_INCLUDE_DIR} ) link_directories( diff --git a/tdeioslave/audiocd/CMakeLists.txt b/tdeioslave/audiocd/CMakeLists.txt index 03e0324f..822a2934 100644 --- a/tdeioslave/audiocd/CMakeLists.txt +++ b/tdeioslave/audiocd/CMakeLists.txt @@ -20,6 +20,7 @@ include_directories( ${CMAKE_SOURCE_DIR}/kscd ${TQT_INCLUDE_DIRS} ${TDE_INCLUDE_DIR} + ${CDPARANOIA_INCLUDE_DIR} ) link_directories( diff --git a/tdeioslave/audiocd/plugins/wav/CMakeLists.txt b/tdeioslave/audiocd/plugins/wav/CMakeLists.txt index 454ecb11..14e0ace2 100644 --- a/tdeioslave/audiocd/plugins/wav/CMakeLists.txt +++ b/tdeioslave/audiocd/plugins/wav/CMakeLists.txt @@ -16,6 +16,7 @@ include_directories( ${CMAKE_SOURCE_DIR}/libkcddb ${TQT_INCLUDE_DIRS} ${TDE_INCLUDE_DIR} + ${CDPARANOIA_INCLUDE_DIR} ) link_directories( -- cgit v1.2.1