From 5b99179451005ce05395bac782ea99de0b64f279 Mon Sep 17 00:00:00 2001 From: Tobias Doerffel Date: Sat, 18 Oct 2008 15:19:54 +0000 Subject: [PATCH] do not create alsaconfig.h git-svn-id: https://lmms.svn.sf.net/svnroot/lmms/trunk/lmms@1773 0778d3d1-df1d-0410-868b-ea421aaaa00d --- CMakeLists.txt | 7 +++---- ChangeLog | 4 ++++ cmake/modules/FindAlsa.cmake | 29 ++++++++++++----------------- 3 files changed, 19 insertions(+), 21 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index efaf3faea..181865c0e 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -227,8 +227,7 @@ ENDIF(LMMS_HAVE_SOUNDCARD_H OR LMMS_HAVE_SYS_SOUNDCARD_H) # check for ALSA IF(WANT_ALSA) - INCLUDE(FindAlsa) - ALSA_CONFIGURE_FILE(${CMAKE_BINARY_DIR}/alsaconfig.h) + FIND_PACKAGE(Alsa) IF(ALSA_FOUND) SET(LMMS_HAVE_ALSA TRUE) SET(STATUS_ALSA "OK") @@ -468,7 +467,7 @@ ENDIF(LMMS_BUILD_WIN32) # ADD_CUSTOM_TARGET(distclean COMMAND make clean - COMMAND rm -rf `find -name cmake_install.cmake` `find -name Makefile` `find -type d -name CMakeFiles` CMakeCache.txt lmmsconfig.h alsaconfig.h lmms.1.gz) + COMMAND rm -rf `find -name cmake_install.cmake` `find -name Makefile` `find -type d -name CMakeFiles` CMakeCache.txt lmmsconfig.h lmms.1.gz) # # add tarball-target @@ -518,7 +517,7 @@ ADD_CUSTOM_TARGET(win32-pkg ) -SET_DIRECTORY_PROPERTIES(PROPERTIES ADDITIONAL_MAKE_CLEAN_FILES "${LMMS_ER_H} ${lmms_MOC_out} ${lmms_UI_out} lmmsconfig.h alsaconfig.h lmms.1.gz") +SET_DIRECTORY_PROPERTIES(PROPERTIES ADDITIONAL_MAKE_CLEAN_FILES "${LMMS_ER_H} ${lmms_MOC_out} ${lmms_UI_out} lmmsconfig.h lmms.1.gz") # diff --git a/ChangeLog b/ChangeLog index 6d0ec536a..393394213 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,5 +1,9 @@ 2008-10-18 Tobias Doerffel + * cmake/modules/FindAlsa.cmake: + * CMakeLists.txt: + do not create alsaconfig.h + * plugins/sf2_player/sf2_player.cpp: do not mess around with global static pointers for a single instance of patchesDialog - create a local object instead (closes #2139701) diff --git a/cmake/modules/FindAlsa.cmake b/cmake/modules/FindAlsa.cmake index e114cf8f8..c70fa7aaa 100644 --- a/cmake/modules/FindAlsa.cmake +++ b/cmake/modules/FindAlsa.cmake @@ -45,25 +45,20 @@ macro(ALSA_VERSION_STRING _result) endmacro(ALSA_VERSION_STRING _result) -get_filename_component(_FIND_ALSA_MODULE_DIR ${CMAKE_CURRENT_LIST_FILE} PATH) -macro(ALSA_CONFIGURE_FILE _destFile) - check_include_files(sys/soundcard.h LMMS_HAVE_SYS_SOUNDCARD_H) - check_include_files(machine/soundcard.h LMMS_HAVE_MACHINE_SOUNDCARD_H) +check_include_files(sys/soundcard.h LMMS_HAVE_SYS_SOUNDCARD_H) +check_include_files(machine/soundcard.h LMMS_HAVE_MACHINE_SOUNDCARD_H) - check_include_files(linux/awe_voice.h LMMS_HAVE_LINUX_AWE_VOICE_H) - check_include_files(awe_voice.h LMMS_HAVE_AWE_VOICE_H) - check_include_files(/usr/src/sys/i386/isa/sound/awe_voice.h LMMS_HAVE__USR_SRC_SYS_I386_ISA_SOUND_AWE_VOICE_H) - check_include_files(/usr/src/sys/gnu/i386/isa/sound/awe_voice.h LMMS_HAVE__USR_SRC_SYS_GNU_I386_ISA_SOUND_AWE_VOICE_H) +check_include_files(linux/awe_voice.h LMMS_HAVE_LINUX_AWE_VOICE_H) +check_include_files(awe_voice.h LMMS_HAVE_AWE_VOICE_H) +check_include_files(/usr/src/sys/i386/isa/sound/awe_voice.h LMMS_HAVE__USR_SRC_SYS_I386_ISA_SOUND_AWE_VOICE_H) +check_include_files(/usr/src/sys/gnu/i386/isa/sound/awe_voice.h LMMS_HAVE__USR_SRC_SYS_GNU_I386_ISA_SOUND_AWE_VOICE_H) - check_include_file_cxx(sys/asoundlib.h LMMS_HAVE_SYS_ASOUNDLIB_H) - check_include_file_cxx(alsa/asoundlib.h LMMS_HAVE_ALSA_ASOUNDLIB_H) +check_include_file_cxx(sys/asoundlib.h LMMS_HAVE_SYS_ASOUNDLIB_H) +check_include_file_cxx(alsa/asoundlib.h LMMS_HAVE_ALSA_ASOUNDLIB_H) - check_library_exists(asound snd_pcm_resume "${ASOUND_LIBRARY_DIR}" ASOUND_HAS_SND_PCM_RESUME) - if(ASOUND_HAS_SND_PCM_RESUME) - set(HAVE_SND_PCM_RESUME 1) - endif(ASOUND_HAS_SND_PCM_RESUME) - - configure_file(${_FIND_ALSA_MODULE_DIR}/config-alsa.h.cmake ${_destFile}) -endmacro(ALSA_CONFIGURE_FILE _destFile) +check_library_exists(asound snd_pcm_resume "${ASOUND_LIBRARY_DIR}" ASOUND_HAS_SND_PCM_RESUME) +if(ASOUND_HAS_SND_PCM_RESUME) +set(HAVE_SND_PCM_RESUME 1) +endif(ASOUND_HAS_SND_PCM_RESUME) mark_as_advanced(ALSA_INCLUDES ASOUND_LIBRARY)