summaryrefslogtreecommitdiff
path: root/cmake
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 /cmake
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 'cmake')
-rw-r--r--cmake/Dependencies.cmake25
1 files changed, 0 insertions, 25 deletions
diff --git a/cmake/Dependencies.cmake b/cmake/Dependencies.cmake
index 572b77b0..66e94da7 100644
--- a/cmake/Dependencies.cmake
+++ b/cmake/Dependencies.cmake
@@ -20,9 +20,6 @@ pkg_use_module(VPX vpx )
20# For tox-bootstrapd. 20# For tox-bootstrapd.
21pkg_use_module(LIBCONFIG libconfig ) 21pkg_use_module(LIBCONFIG libconfig )
22 22
23# For auto tests.
24pkg_use_module(CHECK check )
25
26# For tox-spectest. 23# For tox-spectest.
27pkg_use_module(MSGPACK msgpack ) 24pkg_use_module(MSGPACK msgpack )
28 25
@@ -38,7 +35,6 @@ pkg_use_module(SNDFILE sndfile )
38# These require specific installation paths of dependencies: 35# These require specific installation paths of dependencies:
39# - libsodium in libsodium/Win32/Release/v140/static 36# - libsodium in libsodium/Win32/Release/v140/static
40# - pthreads in pthreads-win32/Pre-built.2 37# - pthreads in pthreads-win32/Pre-built.2
41# - check in %PROGRAMFILES%/check
42# 38#
43############################################################################### 39###############################################################################
44 40
@@ -60,27 +56,6 @@ if(MSVC)
60 message(FATAL_ERROR "libsodium libraries not found") 56 message(FATAL_ERROR "libsodium libraries not found")
61 endif() 57 endif()
62 58
63 # check
64 # -----
65 #
66 # We look for the check and compat (containing clock_gettime and other POSIX
67 # functions not present on Windows) libraries in Program Files, since that is
68 # the default location where cmake installs its packages.
69 find_library(LIBCHECK_LIBRARIES
70 NAMES check libcheck
71 PATHS "$ENV{PROGRAMFILES}/check/lib"
72 )
73 find_library(LIBCOMPAT_LIBRARIES
74 NAMES compat libcompat
75 PATHS "$ENV{PROGRAMFILES}/check/lib"
76 )
77 if(LIBCHECK_LIBRARIES AND LIBCOMPAT_LIBRARIES)
78 include_directories("$ENV{PROGRAMFILES}/check/include")
79 set(CHECK_FOUND TRUE)
80 set(CHECK_LIBRARIES ${LIBCHECK_LIBRARIES} ${LIBCOMPAT_LIBRARIES})
81 message("check: ${CHECK_LIBRARIES}")
82 endif()
83
84 # pthreads 59 # pthreads
85 # -------- 60 # --------
86 if(CMAKE_USE_WIN32_THREADS_INIT) 61 if(CMAKE_USE_WIN32_THREADS_INIT)