From c7f63737ebfff2d1948ec9d6d92295a75d75cae5 Mon Sep 17 00:00:00 2001 From: Maxim Biro Date: Sun, 16 Apr 2017 05:57:21 -0400 Subject: Revert "Implement tox_loop" This reverts commit 5ff099763b1f56414572e1c12eb2f003117db5a0. --- cmake/Dependencies.cmake | 32 ++++++++++++-------------------- 1 file changed, 12 insertions(+), 20 deletions(-) (limited to 'cmake/Dependencies.cmake') diff --git a/cmake/Dependencies.cmake b/cmake/Dependencies.cmake index 4cb96594..5ad332bd 100644 --- a/cmake/Dependencies.cmake +++ b/cmake/Dependencies.cmake @@ -8,38 +8,30 @@ include(ModulePackage) find_package(Threads REQUIRED) -find_library(NCURSES_LIBRARIES ncurses ) -find_library(UTIL_LIBRARIES util ) -find_library(RT_LIBRARIES rt ) +find_library(NCURSES_LIBRARIES ncurses ) +find_library(UTIL_LIBRARIES util ) +find_library(RT_LIBRARIES rt ) # For toxcore. -pkg_use_module(LIBSODIUM libsodium ) -pkg_use_module(LIBEV ev ) -if(NOT LIBEV_FOUND) - if(NOT WIN32) - pkg_use_module(LIBEVENT libevent_pthreads ) - else() - pkg_use_module(LIBEVENT libevent ) - endif() -endif() +pkg_use_module(LIBSODIUM libsodium ) # For toxav. -pkg_use_module(OPUS opus ) -pkg_use_module(VPX vpx ) +pkg_use_module(OPUS opus ) +pkg_use_module(VPX vpx ) # For tox-bootstrapd. -pkg_use_module(LIBCONFIG libconfig ) +pkg_use_module(LIBCONFIG libconfig ) # For auto tests. -pkg_use_module(CHECK check ) +pkg_use_module(CHECK check ) # For tox-spectest. -pkg_use_module(MSGPACK msgpack ) +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 ) +pkg_use_module(OPENCV opencv ) +pkg_use_module(PORTAUDIO portaudio-2.0) +pkg_use_module(SNDFILE sndfile ) ############################################################################### # -- cgit v1.2.3