From 6cd4fcdec4e6671e63e8c7cba2ab4c6d594b13fd Mon Sep 17 00:00:00 2001 From: iphydf Date: Mon, 5 Feb 2018 21:38:58 +0000 Subject: Remove libcheck from the dependencies. We're not gaining much from this library, and it's a burden, especially for windows development. --- CMakeLists.txt | 13 ++++++------- 1 file changed, 6 insertions(+), 7 deletions(-) (limited to 'CMakeLists.txt') diff --git a/CMakeLists.txt b/CMakeLists.txt index 0dc1931b..9450ab74 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -223,6 +223,7 @@ add_submodule(toxcore toxnetwork toxcore/util.h) target_link_modules(toxnetwork toxcrypto) +message("CMAKE_THREAD_LIBS_INIT: ${CMAKE_THREAD_LIBS_INIT}") if(CMAKE_THREAD_LIBS_INIT) target_link_modules(toxnetwork ${CMAKE_THREAD_LIBS_INIT}) set(toxnetwork_PKGCONFIG_LIBS ${toxnetwork_PKGCONFIG_LIBS} ${CMAKE_THREAD_LIBS_INIT}) @@ -497,14 +498,13 @@ elseif(FORMAT_TEST) endif() function(auto_test target) - if(CHECK_FOUND AND NOT (MSVC AND ARGV1 STREQUAL "MSVC_DONT_BUILD")) + if(NOT (MSVC AND ARGV1 STREQUAL "MSVC_DONT_BUILD")) add_executable(auto_${target}_test auto_tests/${target}_test.c) target_link_modules(auto_${target}_test toxcore toxcrypto toxmessenger - toxnetcrypto - ${CHECK_LIBRARIES}) + toxnetcrypto) if(NOT ARGV1 STREQUAL "DONT_RUN") add_test(NAME ${target} COMMAND ${CROSSCOMPILING_EMULATOR} auto_${target}_test) set_tests_properties(${target} PROPERTIES TIMEOUT "${TEST_TIMEOUT_SECONDS}") @@ -512,17 +512,16 @@ function(auto_test target) endif() endfunction() -if(BUILD_TOXAV AND CHECK_FOUND) +if(BUILD_TOXAV) add_definitions(-D__STDC_LIMIT_MACROS=1) add_executable(auto_monolith_test auto_tests/monolith_test.cpp ${ANDROID_CPU_FEATURES}) target_link_modules(auto_monolith_test - ${CHECK_LIBRARIES} + ${toxcore_PKGCONFIG_LIBS} ${LIBSODIUM_LIBRARIES} ${OPUS_LIBRARIES} - ${VPX_LIBRARIES} - ${toxcore_PKGCONFIG_LIBS}) + ${VPX_LIBRARIES}) add_test(NAME monolith COMMAND ${CROSSCOMPILING_EMULATOR} auto_monolith_test) if(ANDROID_CPU_FEATURES) -- cgit v1.2.3