diff options
Diffstat (limited to 'CMakeLists.txt')
-rw-r--r-- | CMakeLists.txt | 17 |
1 files changed, 10 insertions, 7 deletions
diff --git a/CMakeLists.txt b/CMakeLists.txt index 8cd5bae6..742facd1 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt | |||
@@ -66,7 +66,7 @@ enable_testing() | |||
66 | 66 | ||
67 | set(CMAKE_MACOSX_RPATH ON) | 67 | set(CMAKE_MACOSX_RPATH ON) |
68 | 68 | ||
69 | if(NOT "${CMAKE_CXX_COMPILER_ID}" STREQUAL "MSVC") | 69 | if(NOT MSVC) |
70 | # Set standard version for compiler. | 70 | # Set standard version for compiler. |
71 | add_cflag("-std=c99") | 71 | add_cflag("-std=c99") |
72 | add_cxxflag("-std=c++11") | 72 | add_cxxflag("-std=c++11") |
@@ -183,10 +183,12 @@ include(Dependencies) | |||
183 | 183 | ||
184 | if(BUILD_TOXAV) | 184 | if(BUILD_TOXAV) |
185 | if(NOT OPUS_FOUND) | 185 | if(NOT OPUS_FOUND) |
186 | message(SEND_ERROR "Option BUILD_TOXAV is enabled but required library OPUS was not found.") | 186 | message(WARNING "Option BUILD_TOXAV is enabled but required library OPUS was not found.") |
187 | set(BUILD_TOXAV OFF) | ||
187 | endif() | 188 | endif() |
188 | if(NOT VPX_FOUND) | 189 | if(NOT VPX_FOUND) |
189 | message(SEND_ERROR "Option BUILD_TOXAV is enabled but required library VPX was not found.") | 190 | message(WARNING "Option BUILD_TOXAV is enabled but required library VPX was not found.") |
191 | set(BUILD_TOXAV OFF) | ||
190 | endif() | 192 | endif() |
191 | endif() | 193 | endif() |
192 | 194 | ||
@@ -492,7 +494,7 @@ elseif(FORMAT_TEST) | |||
492 | endif() | 494 | endif() |
493 | 495 | ||
494 | function(auto_test target) | 496 | function(auto_test target) |
495 | if(CHECK_FOUND AND NOT ("${CMAKE_CXX_COMPILER_ID}" STREQUAL "MSVC" AND ARGV1 STREQUAL "MSVC_DONT_BUILD")) | 497 | if(CHECK_FOUND AND NOT (MSVC AND ARGV1 STREQUAL "MSVC_DONT_BUILD")) |
496 | add_executable(auto_${target}_test auto_tests/${target}_test.c) | 498 | add_executable(auto_${target}_test auto_tests/${target}_test.c) |
497 | target_link_modules(auto_${target}_test | 499 | target_link_modules(auto_${target}_test |
498 | toxcore | 500 | toxcore |
@@ -568,10 +570,11 @@ if(DHT_BOOTSTRAP) | |||
568 | endif() | 570 | endif() |
569 | 571 | ||
570 | option(BOOTSTRAP_DAEMON "Enable building of tox-bootstrapd" ON) | 572 | option(BOOTSTRAP_DAEMON "Enable building of tox-bootstrapd" ON) |
573 | if(BOOTSTRAP_DAEMON AND WIN32) | ||
574 | message(WARNING "Building tox-bootstrapd for Windows is not supported") | ||
575 | set(BOOTSTRAP_DAEMON OFF) | ||
576 | endif() | ||
571 | if(BOOTSTRAP_DAEMON) | 577 | if(BOOTSTRAP_DAEMON) |
572 | if(WIN32) | ||
573 | message(FATAL_ERROR "Building tox-bootstrapd for Windows is not supported") | ||
574 | endif() | ||
575 | if(LIBCONFIG_FOUND) | 578 | if(LIBCONFIG_FOUND) |
576 | add_executable(tox-bootstrapd | 579 | add_executable(tox-bootstrapd |
577 | other/bootstrap_daemon/src/command_line_arguments.c | 580 | other/bootstrap_daemon/src/command_line_arguments.c |