Skip to content
GitLab
Menu
Projects
Groups
Snippets
Loading...
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
Menu
Open sidebar
BC
public
mediastreamer2
Commits
c105b3d1
Commit
c105b3d1
authored
Aug 26, 2014
by
Ghislain MARY
Browse files
Fix finding of alsa library when compiling with CMake.
parent
dd5cf547
Changes
3
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
67 additions
and
2 deletions
+67
-2
CMakeLists.txt
CMakeLists.txt
+1
-1
FindMS2.cmake.in
FindMS2.cmake.in
+1
-1
cmake/FindALSA.cmake
cmake/FindALSA.cmake
+65
-0
No files found.
CMakeLists.txt
View file @
c105b3d1
...
...
@@ -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
...
...
FindMS2.cmake.in
View file @
c105b3d1
...
...
@@ -76,7 +76,7 @@ if(@ENABLE_VIDEO@)
endif()
endif()
set(_MS2ROOT_PATHS
set(_MS2
_
ROOT_PATHS
${WITH_MS2}
${CMAKE_INSTALL_PREFIX}
)
...
...
cmake/FindALSA.cmake
0 → 100644
View file @
c105b3d1
############################################################################
# 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
)
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
.
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment