summaryrefslogtreecommitdiff
path: root/CMakeLists.txt
diff options
context:
space:
mode:
authoriphydf <iphydf@users.noreply.github.com>2018-02-05 21:38:58 +0000
committeriphydf <iphydf@users.noreply.github.com>2018-02-09 20:51:39 +0000
commit6cd4fcdec4e6671e63e8c7cba2ab4c6d594b13fd (patch)
tree09485be8361d503f1acdee57055535a6b3331d17 /CMakeLists.txt
parent05912fd65c52f97a600383be11cd741ae32d61bf (diff)
Remove libcheck from the dependencies.
We're not gaining much from this library, and it's a burden, especially for windows development.
Diffstat (limited to 'CMakeLists.txt')
-rw-r--r--CMakeLists.txt13
1 files changed, 6 insertions, 7 deletions
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
223 toxcore/util.h) 223 toxcore/util.h)
224target_link_modules(toxnetwork toxcrypto) 224target_link_modules(toxnetwork toxcrypto)
225 225
226message("CMAKE_THREAD_LIBS_INIT: ${CMAKE_THREAD_LIBS_INIT}")
226if(CMAKE_THREAD_LIBS_INIT) 227if(CMAKE_THREAD_LIBS_INIT)
227 target_link_modules(toxnetwork ${CMAKE_THREAD_LIBS_INIT}) 228 target_link_modules(toxnetwork ${CMAKE_THREAD_LIBS_INIT})
228 set(toxnetwork_PKGCONFIG_LIBS ${toxnetwork_PKGCONFIG_LIBS} ${CMAKE_THREAD_LIBS_INIT}) 229 set(toxnetwork_PKGCONFIG_LIBS ${toxnetwork_PKGCONFIG_LIBS} ${CMAKE_THREAD_LIBS_INIT})
@@ -497,14 +498,13 @@ elseif(FORMAT_TEST)
497endif() 498endif()
498 499
499function(auto_test target) 500function(auto_test target)
500 if(CHECK_FOUND AND NOT (MSVC AND ARGV1 STREQUAL "MSVC_DONT_BUILD")) 501 if(NOT (MSVC AND ARGV1 STREQUAL "MSVC_DONT_BUILD"))
501 add_executable(auto_${target}_test auto_tests/${target}_test.c) 502 add_executable(auto_${target}_test auto_tests/${target}_test.c)
502 target_link_modules(auto_${target}_test 503 target_link_modules(auto_${target}_test
503 toxcore 504 toxcore
504 toxcrypto 505 toxcrypto
505 toxmessenger 506 toxmessenger
506 toxnetcrypto 507 toxnetcrypto)
507 ${CHECK_LIBRARIES})
508 if(NOT ARGV1 STREQUAL "DONT_RUN") 508 if(NOT ARGV1 STREQUAL "DONT_RUN")
509 add_test(NAME ${target} COMMAND ${CROSSCOMPILING_EMULATOR} auto_${target}_test) 509 add_test(NAME ${target} COMMAND ${CROSSCOMPILING_EMULATOR} auto_${target}_test)
510 set_tests_properties(${target} PROPERTIES TIMEOUT "${TEST_TIMEOUT_SECONDS}") 510 set_tests_properties(${target} PROPERTIES TIMEOUT "${TEST_TIMEOUT_SECONDS}")
@@ -512,17 +512,16 @@ function(auto_test target)
512 endif() 512 endif()
513endfunction() 513endfunction()
514 514
515if(BUILD_TOXAV AND CHECK_FOUND) 515if(BUILD_TOXAV)
516 add_definitions(-D__STDC_LIMIT_MACROS=1) 516 add_definitions(-D__STDC_LIMIT_MACROS=1)
517 add_executable(auto_monolith_test 517 add_executable(auto_monolith_test
518 auto_tests/monolith_test.cpp 518 auto_tests/monolith_test.cpp
519 ${ANDROID_CPU_FEATURES}) 519 ${ANDROID_CPU_FEATURES})
520 target_link_modules(auto_monolith_test 520 target_link_modules(auto_monolith_test
521 ${CHECK_LIBRARIES} 521 ${toxcore_PKGCONFIG_LIBS}
522 ${LIBSODIUM_LIBRARIES} 522 ${LIBSODIUM_LIBRARIES}
523 ${OPUS_LIBRARIES} 523 ${OPUS_LIBRARIES}
524 ${VPX_LIBRARIES} 524 ${VPX_LIBRARIES})
525 ${toxcore_PKGCONFIG_LIBS})
526 add_test(NAME monolith COMMAND ${CROSSCOMPILING_EMULATOR} auto_monolith_test) 525 add_test(NAME monolith COMMAND ${CROSSCOMPILING_EMULATOR} auto_monolith_test)
527 526
528 if(ANDROID_CPU_FEATURES) 527 if(ANDROID_CPU_FEATURES)