summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorSlávek Banko <slavek.banko@axis.cz>2018-06-08 02:08:01 +0200
committerSlávek Banko <slavek.banko@axis.cz>2018-06-08 02:08:01 +0200
commite67c454194b6b4a2ed68b4e1124613a0b05a4d69 (patch)
treee503f43e4b7bbd7e2c0dd27cb2f2d94948d1b02b
parentd81209c6f41eb3f939b8d380c4326adf8b886403 (diff)
downloadtdemultimedia-e67c4541.tar.gz
tdemultimedia-e67c4541.zip
cmake: Add other missing checks
Signed-off-by: Slávek Banko <slavek.banko@axis.cz>
-rw-r--r--ConfigureChecks.cmake13
-rw-r--r--arts/builder/CMakeLists.txt2
-rw-r--r--config.h.cmake6
-rw-r--r--kscd/libwm/CMakeLists.txt2
4 files changed, 19 insertions, 4 deletions
diff --git a/ConfigureChecks.cmake b/ConfigureChecks.cmake
index 12c977e..c5b7c0f 100644
--- a/ConfigureChecks.cmake
+++ b/ConfigureChecks.cmake
@@ -85,7 +85,11 @@ find_package( TDE )
check_include_file( stdint.h HAVE_STDINT_H )
check_include_file( inttypes.h HAVE_INTTYPES_H )
+check_include_file( getopt.h HAVE_GETOPT_H )
+check_include_file( pthread.h HAVE_LIBPTHREAD )
+check_include_file( alsa/asoundlib.h HAVE_ALSA_ASOUNDLIB_H )
+check_include_file( sys/asoundlib.h HAVE_SYS_ASOUNDLIB_H )
check_include_file( soundcard.h HAVE_SOUNDCARD_H )
check_include_file( sys/soundcard.h HAVE_SYS_SOUNDCARD_H )
check_include_file( machine/soundcard.h HAVE_MACHINE_SOUNDCARD_H )
@@ -106,11 +110,16 @@ endif( NOT HAVE_LIBDL )
# ALSA
if( WITH_ALSA )
- find_package( ALSA )
+ pkg_check_modules( ALSA alsa>=0.5 )
if( NOT ALSA_FOUND )
tde_message_fatal( "ALSA support is requested, but was not found on your system" )
endif( NOT ALSA_FOUND )
- set( HAVE_LIBASOUND2 1 )
+ if( NOT ALSA_VERSION VERSION_LESS "0.9" )
+ set( HAVE_LIBASOUND2 1 )
+ set( HAVE_ARTS_LIBASOUND2 1 )
+ else()
+ set( HAVE_ARTS_LIBASOUND 1 )
+ endif()
endif( WITH_ALSA )
diff --git a/arts/builder/CMakeLists.txt b/arts/builder/CMakeLists.txt
index 942cd3b..9cb93b4 100644
--- a/arts/builder/CMakeLists.txt
+++ b/arts/builder/CMakeLists.txt
@@ -39,7 +39,7 @@ tde_add_executable( artsbuilder AUTOMOC
execdlg.cpp qttableview.cpp interfacedlg.cpp
LINK
tdecore-shared tdeui-shared tdeio-shared artsbuilder-shared artskde-shared
- mcop qtmcop artsflow_idl soundserver_idl
+ mcop qtmcop artsflow_idl soundserver_idl pthread
DEPENDENCIES
arts_builder_headers
DESTINATION ${BIN_INSTALL_DIR}
diff --git a/config.h.cmake b/config.h.cmake
index bee1080..61dd916 100644
--- a/config.h.cmake
+++ b/config.h.cmake
@@ -15,10 +15,16 @@
#cmakedefine HAVE_STDINT_H 1
#cmakedefine HAVE_INTTYPES_H 1
+#cmakedefine HAVE_GETOPT_H 1
+#cmakedefine HAVE_LIBPTHREAD 1
#cmakedefine HAVE_ARTS 1
#cmakedefine HAVE_AKODE 1
#cmakedefine HAVE_LIBASOUND2 1
+#cmakedefine HAVE_ARTS_LIBASOUND 1
+#cmakedefine HAVE_ARTS_LIBASOUND2 1
+#cmakedefine HAVE_ALSA_ASOUNDLIB_H 1
+#cmakedefine HAVE_SYS_ASOUNDLIB_H 1
#cmakedefine HAVE_SOUNDCARD_H 1
#cmakedefine HAVE_SYS_SOUNDCARD_H 1
diff --git a/kscd/libwm/CMakeLists.txt b/kscd/libwm/CMakeLists.txt
index e40ac76..7e63270 100644
--- a/kscd/libwm/CMakeLists.txt
+++ b/kscd/libwm/CMakeLists.txt
@@ -34,5 +34,5 @@ tde_add_library( workman STATIC_PIC
EMBED
workmanaudio-static
LINK
- pthread
+ ${ALSA_LIBRARIES} pthread
)