summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorFrançois Andriot <francois.andriot@free.fr>2017-10-13 15:27:24 (GMT)
committer Slávek Banko <slavek.banko@axis.cz>2017-10-13 15:27:24 (GMT)
commitf0f2d8725be5a35c448e2a85707086818f7a93e6 (patch)
tree64877d895d3001f703b38cefc477739c5f923862
parent8b12682035e2ae92a29a9ce12abc5fbcf38b1192 (diff)
downloadtdemultimedia-f0f2d872.zip
tdemultimedia-f0f2d872.tar.gz
cmake: Fix detection on cdda include files
Signed-off-by: François Andriot <francois.andriot@free.fr>
-rw-r--r--ConfigureChecks.cmake2
-rw-r--r--mpeglib/example/cddaplay/CMakeLists.txt1
-rw-r--r--mpeglib/example/mpgplay/CMakeLists.txt1
-rw-r--r--mpeglib/example/splay/CMakeLists.txt1
-rw-r--r--mpeglib/example/tplay/CMakeLists.txt1
-rw-r--r--mpeglib/example/yaf/yafcdda/CMakeLists.txt1
-rw-r--r--mpeglib/example/yaf/yafmpgplay/CMakeLists.txt1
-rw-r--r--mpeglib/example/yaf/yafsplay/CMakeLists.txt1
-rw-r--r--mpeglib/example/yaf/yaftplay/CMakeLists.txt1
-rw-r--r--mpeglib/example/yaf/yafvorbis/CMakeLists.txt1
-rw-r--r--mpeglib/example/yaf/yafxplayer/CMakeLists.txt1
-rw-r--r--mpeglib/example/yaf/yafyuv/CMakeLists.txt1
-rw-r--r--mpeglib/lib/decoder/CMakeLists.txt1
-rw-r--r--mpeglib/lib/input/CMakeLists.txt1
-rw-r--r--mpeglib/lib/mpegplay/CMakeLists.txt1
-rw-r--r--mpeglib/lib/mpgplayer/CMakeLists.txt1
-rw-r--r--mpeglib/lib/yuv/CMakeLists.txt1
-rw-r--r--mpeglib_artsplug/CMakeLists.txt1
-rw-r--r--tdeioslave/audiocd/CMakeLists.txt1
-rw-r--r--tdeioslave/audiocd/plugins/wav/CMakeLists.txt1
20 files changed, 21 insertions, 0 deletions
diff --git a/ConfigureChecks.cmake b/ConfigureChecks.cmake
index a7f72d9..ca404b8 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 <cdda_interface.h>
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 1ffecb0..afa2415 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 7ef2188..9beea85 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 d7292f7..fd5ab9d 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 06f25e9..eba9475 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 5579f59..8d90112 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 5692823..072f124 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 7850900..726513f 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 eeb05ea..bd60230 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 bc22399..6bf7bed 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 95f2c5b..6763265 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 37c6b62..7bfb162 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 eb1371a..a77ff51 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 37e1f53..8e17e90 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 2ae612b..9004981 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 4f5db11..0083518 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 ba551fc..f824135 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 61ad25d..3a9fbd8 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 03e0324..822a293 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 454ecb1..14e0ace 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(