Commit c105b3d1 authored by Ghislain MARY's avatar Ghislain MARY

Fix finding of alsa library when compiling with CMake.

parent dd5cf547
......@@ -324,7 +324,7 @@ add_definitions(-DHAVE_CONFIG_H)
add_definitions(${ORTP_CPPFLAGS})
configure_file(${CMAKE_CURRENT_SOURCE_DIR}/FindMS2.cmake.in ${CMAKE_CURRENT_BINARY_DIR}/FindMS2.cmake)
configure_file(${CMAKE_CURRENT_SOURCE_DIR}/FindMS2.cmake.in ${CMAKE_CURRENT_BINARY_DIR}/FindMS2.cmake @ONLY)
install(FILES ${CMAKE_CURRENT_BINARY_DIR}/FindMS2.cmake
DESTINATION share/cmake/Modules
PERMISSIONS OWNER_READ OWNER_WRITE GROUP_READ WORLD_READ
......
......@@ -76,7 +76,7 @@ if(@ENABLE_VIDEO@)
endif()
endif()
set(_MS2ROOT_PATHS
set(_MS2_ROOT_PATHS
${WITH_MS2}
${CMAKE_INSTALL_PREFIX}
)
......
############################################################################
# FindALSA.txt
# Copyright (C) 2014 Belledonne Communications, Grenoble France
#
############################################################################
#
# This program is free software; you can redistribute it and/or
# modify it under the terms of the GNU General Public License
# as published by the Free Software Foundation; either version 2
# of the License, or (at your option) any later version.
#
# This program is distributed in the hope that it will be useful,
# but WITHOUT ANY WARRANTY; without even the implied warranty of
# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
# GNU General Public License for more details.
#
# You should have received a copy of the GNU General Public License
# along with this program; if not, write to the Free Software
# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
#
############################################################################
#
# - Find the ALSA include file and library
#
# ALSA_FOUND - system has ALSA
# ALSA_INCLUDE_DIRS - the ALSA include directory
# ALSA_LIBRARIES - The libraries needed to use ALSA
include(CheckSymbolExists)
set(_ALSA_ROOT_PATHS
${WITH_ALSA}
${CMAKE_INSTALL_PREFIX}
)
find_path(ALSA_INCLUDE_DIRS
NAMES alsa/asoundlib.h
HINTS _ALSA_ROOT_PATHS
PATH_SUFFIXES include
)
if(ALSA_INCLUDE_DIRS)
set(HAVE_ALSA_ASOUNDLIB_H 1)
endif()
find_library(ALSA_LIBRARIES
NAMES asound
HINTS _ALSA_ROOT_PATHS
PATH_SUFFIXES bin lib
)
if(ALSA_LIBRARIES)
cmake_push_check_state(RESET)
list(APPEND CMAKE_REQUIRED_INCLUDES ${ALSA_INCLUDE_DIRS})
list(APPEND CMAKE_REQUIRED_LIBRARIES ${ALSA_LIBRARIES})
check_symbol_exists(snd_pcm_open "alsa/asoundlib.h" HAVE_SND_PCM_OPEN)
cmake_pop_check_state()
endif()
include(FindPackageHandleStandardArgs)
find_package_handle_standard_args(ALSA
DEFAULT_MSG
ALSA_INCLUDE_DIRS ALSA_LIBRARIES HAVE_ALSA_ASOUNDLIB_H HAVE_SND_PCM_OPEN
)
mark_as_advanced(ALSA_INCLUDE_DIRS ALSA_LIBRARIES HAVE_ALSA_ASOUNDLIB_H HAVE_SND_PCM_OPEN)
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment