StarMirror/qTox
1
0
Fork 0
mirror of https://github.com/qTox/qTox.git synced 2024-03-22 14:00:36 +08:00
Code Issues Projects Releases Wiki Activity

Merge pull request #4666

Browse Source 
Maxim Biro (1):
      fix(build): Fixed header file of libfilteraudio not being found
This commit is contained in:
sudden6 2017-09-21 12:10:10 +02:00
commit e1ca609034
No known key found for this signature in database
GPG Key ID: 279509B499E032B9
2 changed files with 4 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
CMakeLists.txt
View File

@ -538,7 +538,7 @@ if(${ENABLE_GTK_SYSTRAY})
endif() endif()
if(${USE_FILTERAUDIO}) if(${USE_FILTERAUDIO})
search_dependency(FILTERAUDIO LIBRARY filteraudio OPTIONAL) search_dependency(FILTERAUDIO LIBRARY filteraudio HEADER filter_audio.h OPTIONAL)
if(${FILTERAUDIO_FOUND}) if(${FILTERAUDIO_FOUND})
set(${PROJECT_NAME}_SOURCES ${${PROJECT_NAME}_SOURCES} set(${PROJECT_NAME}_SOURCES ${${PROJECT_NAME}_SOURCES}
src/audio/backend/openal2.cpp src/audio/backend/openal2.cpp

5
cmake/Dependencies.cmake
View File

@ -35,7 +35,7 @@ include(Qt5CorePatches)
function(search_dependency pkg) function(search_dependency pkg)
set(options OPTIONAL) set(options OPTIONAL)
set(oneValueArgs PACKAGE LIBRARY FRAMEWORK) set(oneValueArgs PACKAGE LIBRARY FRAMEWORK HEADER)
set(multiValueArgs) set(multiValueArgs)
cmake_parse_arguments(arg "${options}" "${oneValueArgs}" "${multiValueArgs}" ${ARGN}) cmake_parse_arguments(arg "${options}" "${oneValueArgs}" "${multiValueArgs}" ${ARGN})
@ -60,7 +60,8 @@ function(search_dependency pkg)
# Last, search for the library itself globally. # Last, search for the library itself globally.
if(NOT ${pkg}_FOUND AND arg_LIBRARY) if(NOT ${pkg}_FOUND AND arg_LIBRARY)
find_library(${pkg}_LIBRARIES NAMES ${arg_LIBRARY}) find_library(${pkg}_LIBRARIES NAMES ${arg_LIBRARY})
if(${pkg}_LIBRARIES) find_path(${pkg}_INCLUDE_DIRS NAMES ${arg_HEADER})
if(${pkg}_LIBRARIES AND ${pkg}_INCLUDE_DIRS)
set(${pkg}_FOUND TRUE) set(${pkg}_FOUND TRUE)
endif() endif()
endif() endif()