StarMirror/toxcore
1
0
Fork 0
mirror of https://github.com/irungentoo/toxcore.git synced 2024-03-22 13:30:51 +08:00
Code Issues Projects Releases Wiki Activity

Make cmake script more forgiving.

Browse Source 
Instead of hard-erroring when we don't find dependencies, we just don't
build the things requested and print a warning. This is less annoying to
users because we enable a bunch of things by default. This way, we can at
least build something with the default "cmake" invocation.
This commit is contained in:
iphydf 2018-02-04 17:32:36 +00:00
parent 835b9fbdc9
commit dcd439a5c3
No known key found for this signature in database
GPG Key ID: 3855DBA2D74403C9
2 changed files with 11 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
CMakeLists.txt
View File

@ -66,7 +66,7 @@ enable_testing()
set(CMAKE_MACOSX_RPATH ON) set(CMAKE_MACOSX_RPATH ON)
if(NOT "${CMAKE_CXX_COMPILER_ID}" STREQUAL "MSVC") if(NOT MSVC)
# Set standard version for compiler. # Set standard version for compiler.
add_cflag("-std=c99") add_cflag("-std=c99")
add_cxxflag("-std=c++11") add_cxxflag("-std=c++11")
@ -183,10 +183,12 @@ include(Dependencies)
if(BUILD_TOXAV) if(BUILD_TOXAV)
if(NOT OPUS_FOUND) if(NOT OPUS_FOUND)
message(SEND_ERROR "Option BUILD_TOXAV is enabled but required library OPUS was not found.") message(WARNING "Option BUILD_TOXAV is enabled but required library OPUS was not found.")
set(BUILD_TOXAV OFF)
endif() endif()
if(NOT VPX_FOUND) if(NOT VPX_FOUND)
message(SEND_ERROR "Option BUILD_TOXAV is enabled but required library VPX was not found.") message(WARNING "Option BUILD_TOXAV is enabled but required library VPX was not found.")
set(BUILD_TOXAV OFF)
endif() endif()
endif() endif()
@ -492,7 +494,7 @@ elseif(FORMAT_TEST)
endif() endif()
function(auto_test target) function(auto_test target)
if(CHECK_FOUND AND NOT ("${CMAKE_CXX_COMPILER_ID}" STREQUAL "MSVC" AND ARGV1 STREQUAL "MSVC_DONT_BUILD")) if(CHECK_FOUND AND NOT (MSVC AND ARGV1 STREQUAL "MSVC_DONT_BUILD"))
add_executable(auto_${target}_test auto_tests/${target}_test.c) add_executable(auto_${target}_test auto_tests/${target}_test.c)
target_link_modules(auto_${target}_test target_link_modules(auto_${target}_test
toxcore toxcore
@ -568,10 +570,11 @@ if(DHT_BOOTSTRAP)
endif() endif()
option(BOOTSTRAP_DAEMON "Enable building of tox-bootstrapd" ON) option(BOOTSTRAP_DAEMON "Enable building of tox-bootstrapd" ON)
if(BOOTSTRAP_DAEMON AND WIN32)
message(WARNING "Building tox-bootstrapd for Windows is not supported")
set(BOOTSTRAP_DAEMON OFF)
endif()
if(BOOTSTRAP_DAEMON) if(BOOTSTRAP_DAEMON)
if(WIN32)
message(FATAL_ERROR "Building tox-bootstrapd for Windows is not supported")
endif()
if(LIBCONFIG_FOUND) if(LIBCONFIG_FOUND)
add_executable(tox-bootstrapd add_executable(tox-bootstrapd
other/bootstrap_daemon/src/command_line_arguments.c other/bootstrap_daemon/src/command_line_arguments.c

2
cmake/Dependencies.cmake
View File

@ -42,7 +42,7 @@ pkg_use_module(SNDFILE sndfile )
# #
############################################################################### ###############################################################################
if("${CMAKE_CXX_COMPILER_ID}" STREQUAL "MSVC") if(MSVC)
# libsodium # libsodium
# --------- # ---------
find_library(LIBSODIUM_LIBRARIES find_library(LIBSODIUM_LIBRARIES