1 files changed, 73 insertions, 96 deletions

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 3e436d35..52a52dee 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -1,4 +1,5 @@
 cmake_minimum_required(VERSION 2.8.6)
+cmake_policy(VERSION 2.8.6)
 project(toxcore)
 include(CTest)
 
@@ -41,7 +42,6 @@ include(ApiDsl)
 include(CheckCCompilerFlag)
 include(CheckCXXCompilerFlag)
 include(MacRpath)
-include(ModulePackage)
 
 set(CMAKE_MACOSX_RPATH ON)
 
@@ -76,77 +76,79 @@ macro(add_flag flag)
   add_cxxflag(${flag})
 endmacro()
   
-# Set standard version for compiler.
-add_cflag("-std=c99")
-add_cxxflag("-std=c++11")
-
-# Warn on non-ISO C.
-add_cflag("-pedantic")
-
-option(WARNINGS "Enable additional compiler warnings" ON)
-if(WARNINGS)
-  # Add all warning flags we can.
-  add_flag("-Wall")
-  add_flag("-Wextra")
-  add_flag("-Weverything")
-
-  # Disable specific warning flags for both C and C++.
-  add_flag("-Wno-cast-align")
-  add_flag("-Wno-conversion")
-  add_flag("-Wno-covered-switch-default")
-  add_flag("-Wno-documentation-deprecated-sync")
-  add_flag("-Wno-format-nonliteral")
-  add_flag("-Wno-missing-field-initializers")
-  add_flag("-Wno-missing-prototypes")
-  add_flag("-Wno-padded")
-  add_flag("-Wno-parentheses")
-  add_flag("-Wno-return-type")
-  add_flag("-Wno-sign-compare")
-  add_flag("-Wno-sign-conversion")
-  add_flag("-Wno-tautological-constant-out-of-range-compare")
-  add_flag("-Wno-type-limits")
-  add_flag("-Wno-undef")
-  add_flag("-Wno-unreachable-code")
-  add_flag("-Wno-unused-macros")
-  add_flag("-Wno-unused-parameter")
-  add_flag("-Wno-vla")
-
-  # Disable specific warning flags for C.
-  add_cflag("-Wno-assign-enum")
-  add_cflag("-Wno-bad-function-cast")
-  add_cflag("-Wno-double-promotion")
-  add_cflag("-Wno-gnu-zero-variadic-macro-arguments")
-  add_cflag("-Wno-packed")
-  add_cflag("-Wno-reserved-id-macro")
-  add_cflag("-Wno-shadow")
-  add_cflag("-Wno-shorten-64-to-32")
-  add_cflag("-Wno-unreachable-code-return")
-  add_cflag("-Wno-unused-but-set-variable")
-  add_cflag("-Wno-used-but-marked-unused")
-
-  # Disable specific warning flags for C++.
-  add_cxxflag("-Wno-c++11-compat")
-  add_cxxflag("-Wno-c++11-extensions")
-  add_cxxflag("-Wno-c++11-narrowing")
-  add_cxxflag("-Wno-c99-extensions")
-  add_cxxflag("-Wno-narrowing")
-  add_cxxflag("-Wno-old-style-cast")
-  add_cxxflag("-Wno-variadic-macros")
-  add_cxxflag("-Wno-vla-extension")
-endif()
+if(NOT "${CMAKE_CXX_COMPILER_ID}" STREQUAL "MSVC")
+  # Set standard version for compiler.
+  add_cflag("-std=c99")
+  add_cxxflag("-std=c++11")
+
+  # Warn on non-ISO C.
+  add_cflag("-pedantic")
+
+  option(WARNINGS "Enable additional compiler warnings" ON)
+  if(WARNINGS)
+    # Add all warning flags we can.
+    add_flag("-Wall")
+    add_flag("-Wextra")
+    add_flag("-Weverything")
+
+    # Disable specific warning flags for both C and C++.
+    add_flag("-Wno-cast-align")
+    add_flag("-Wno-conversion")
+    add_flag("-Wno-covered-switch-default")
+    add_flag("-Wno-documentation-deprecated-sync")
+    add_flag("-Wno-format-nonliteral")
+    add_flag("-Wno-missing-field-initializers")
+    add_flag("-Wno-missing-prototypes")
+    add_flag("-Wno-padded")
+    add_flag("-Wno-parentheses")
+    add_flag("-Wno-return-type")
+    add_flag("-Wno-sign-compare")
+    add_flag("-Wno-sign-conversion")
+    add_flag("-Wno-tautological-constant-out-of-range-compare")
+    add_flag("-Wno-type-limits")
+    add_flag("-Wno-undef")
+    add_flag("-Wno-unreachable-code")
+    add_flag("-Wno-unused-macros")
+    add_flag("-Wno-unused-parameter")
+    add_flag("-Wno-vla")
+
+    # Disable specific warning flags for C.
+    add_cflag("-Wno-assign-enum")
+    add_cflag("-Wno-bad-function-cast")
+    add_cflag("-Wno-double-promotion")
+    add_cflag("-Wno-gnu-zero-variadic-macro-arguments")
+    add_cflag("-Wno-packed")
+    add_cflag("-Wno-reserved-id-macro")
+    add_cflag("-Wno-shadow")
+    add_cflag("-Wno-shorten-64-to-32")
+    add_cflag("-Wno-unreachable-code-return")
+    add_cflag("-Wno-unused-but-set-variable")
+    add_cflag("-Wno-used-but-marked-unused")
+
+    # Disable specific warning flags for C++.
+    add_cxxflag("-Wno-c++11-compat")
+    add_cxxflag("-Wno-c++11-extensions")
+    add_cxxflag("-Wno-c++11-narrowing")
+    add_cxxflag("-Wno-c99-extensions")
+    add_cxxflag("-Wno-narrowing")
+    add_cxxflag("-Wno-old-style-cast")
+    add_cxxflag("-Wno-variadic-macros")
+    add_cxxflag("-Wno-vla-extension")
+  endif()
 
-option(ERROR_ON_WARNING "Make compilation error on a warning" OFF)
-if(ERROR_ON_WARNING)
-  # Set error-on-warn for C compilation. C++ compilation can't use this because
-  # treating 'c' input as 'c++' when in C++ mode is deprecated in clang and
-  # there is no way to turn off that warning.
-  add_cflag("-Werror")
-endif()
+  option(ERROR_ON_WARNING "Make compilation error on a warning" OFF)
+  if(ERROR_ON_WARNING)
+    # Set error-on-warn for C compilation. C++ compilation can't use this because
+    # treating 'c' input as 'c++' when in C++ mode is deprecated in clang and
+    # there is no way to turn off that warning.
+    add_cflag("-Werror")
+  endif()
 
-option(DEBUG "Enable assertions and other debugging facilities" OFF)
-if(DEBUG)
-  set(MIN_LOGGER_LEVEL DEBUG)
-  add_cflag("-g3")
+  option(DEBUG "Enable assertions and other debugging facilities" OFF)
+  if(DEBUG)
+    set(MIN_LOGGER_LEVEL DEBUG)
+    add_cflag("-g3")
+  endif()
 endif()
 
 option(TRACE "Enable TRACE level logging (expensive, for network debugging)" OFF)
@@ -166,32 +168,7 @@ if(ASAN)
   set(CMAKE_REQUIRED_LIBRARIES "${SAFE_CMAKE_REQUIRED_LIBRARIES}")
 endif()
 
-find_package(Threads   REQUIRED)
-
-find_library(NCURSES_LIBRARIES      ncurses       )
-find_library(UTIL_LIBRARIES         util          )
-find_library(RT_LIBRARIES           rt            )
-
-# For toxcore.
-pkg_use_module(LIBSODIUM  REQUIRED  libsodium     )
-
-# For toxav.
-pkg_use_module(OPUS                 opus          )
-pkg_use_module(VPX                  vpx           )
-
-# For tox-bootstrapd.
-pkg_use_module(LIBCONFIG            libconfig     )
-
-# For auto tests.
-pkg_use_module(CHECK                check         )
-
-# For tox-spectest.
-pkg_use_module(MSGPACK              msgpack       )
-
-# For av_test.
-pkg_use_module(OPENCV               opencv        )
-pkg_use_module(PORTAUDIO            portaudio-2.0 )
-pkg_use_module(SNDFILE              sndfile       )
+include(Dependencies)
 
 if(OPUS_FOUND AND VPX_FOUND)
   set(BUILD_TOXAV TRUE)