mirror of
https://github.com/badaix/snapcast.git
synced 2025-07-21 18:38:07 +02:00
Merge branch 'master' into develop
This commit is contained in:
commit
543fc445b6
1 changed files with 2 additions and 2 deletions
|
@ -52,7 +52,7 @@ endif()
|
||||||
|
|
||||||
include_directories("${CMAKE_SOURCE_DIR}"
|
include_directories("${CMAKE_SOURCE_DIR}"
|
||||||
"${CMAKE_SOURCE_DIR}/externals/asio/asio/include"
|
"${CMAKE_SOURCE_DIR}/externals/asio/asio/include"
|
||||||
"/usr/local/include"
|
# "/usr/local/include"
|
||||||
)
|
)
|
||||||
|
|
||||||
set(CMAKE_MODULE_PATH ${CMAKE_MODULE_PATH} "${CMAKE_SOURCE_DIR}/cmake/")
|
set(CMAKE_MODULE_PATH ${CMAKE_MODULE_PATH} "${CMAKE_SOURCE_DIR}/cmake/")
|
||||||
|
@ -105,7 +105,7 @@ else()
|
||||||
message(FATAL_ERROR "Need to have asio installed")
|
message(FATAL_ERROR "Need to have asio installed")
|
||||||
endif()
|
endif()
|
||||||
|
|
||||||
list(APPEND CMAKE_REQUIRED_INCLUDES "/usr/local/include")
|
#list(APPEND CMAKE_REQUIRED_INCLUDES "/usr/local/include")
|
||||||
check_include_file_cxx(popl.hpp HAS_POPL_HPP -std=c++11)
|
check_include_file_cxx(popl.hpp HAS_POPL_HPP -std=c++11)
|
||||||
if(NOT HAS_POPL_HPP)
|
if(NOT HAS_POPL_HPP)
|
||||||
message(FATAL_ERROR "Need to have popl installed")
|
message(FATAL_ERROR "Need to have popl installed")
|
||||||
|
|
Loading…
Add table
Add a link
Reference in a new issue