summaryrefslogtreecommitdiff
path: root/CMakeLists.txt
diff options
context:
space:
mode:
authorMick Sayson <mick@sayson.com>2018-09-20 01:01:40 -0700
committeriphydf <iphydf@users.noreply.github.com>2018-09-22 11:14:45 +0000
commitf87f8719d02a9adbc9413256fe22958267cfefee (patch)
treeeef1842aac108c8887e043e33d16859f85ca8c3c /CMakeLists.txt
parentdc0b2e79193ef303b1ae240e79996d4619138d31 (diff)
Improve cmake build for MSVC.
Diffstat (limited to 'CMakeLists.txt')
-rw-r--r--CMakeLists.txt7
1 files changed, 3 insertions, 4 deletions
diff --git a/CMakeLists.txt b/CMakeLists.txt
index 47d5e372..72d9246f 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -168,7 +168,7 @@ set(toxcore_SOURCES ${toxcore_SOURCES}
168include(CheckFunctionExists) 168include(CheckFunctionExists)
169check_function_exists(explicit_bzero HAVE_EXPLICIT_BZERO) 169check_function_exists(explicit_bzero HAVE_EXPLICIT_BZERO)
170check_function_exists(memset_s HAVE_MEMSET_S) 170check_function_exists(memset_s HAVE_MEMSET_S)
171set(toxcore_LINK_MODULES ${toxcore_LINK_MODULES} ${LIBSODIUM_LIBRARIES}) 171set(toxcore_LINK_MODULES ${toxcore_LINK_MODULES} sodium)
172set(toxcore_PKGCONFIG_REQUIRES ${toxcore_PKGCONFIG_REQUIRES} libsodium) 172set(toxcore_PKGCONFIG_REQUIRES ${toxcore_PKGCONFIG_REQUIRES} libsodium)
173 173
174# LAYER 2: Basic networking 174# LAYER 2: Basic networking
@@ -275,7 +275,7 @@ if(BUILD_TOXAV)
275 toxav/toxav_old.c 275 toxav/toxav_old.c
276 toxav/video.c 276 toxav/video.c
277 toxav/video.h) 277 toxav/video.h)
278 set(toxcore_LINK_MODULES ${toxcore_LINK_MODULES} ${OPUS_LIBRARIES} ${VPX_LIBRARIES}) 278 set(toxcore_LINK_MODULES ${toxcore_LINK_MODULES} Opus::Opus Vpx::Vpx)
279 set(toxcore_PKGCONFIG_REQUIRES ${toxcore_PKGCONFIG_REQUIRES} opus vpx) 279 set(toxcore_PKGCONFIG_REQUIRES ${toxcore_PKGCONFIG_REQUIRES} opus vpx)
280 280
281 set(toxcore_API_HEADERS ${toxcore_API_HEADERS} ${toxcore_SOURCE_DIR}/toxav/toxav.h^toxav) 281 set(toxcore_API_HEADERS ${toxcore_API_HEADERS} ${toxcore_SOURCE_DIR}/toxav/toxav.h^toxav)
@@ -304,11 +304,10 @@ set(toxcore_API_HEADERS ${toxcore_API_HEADERS} ${toxcore_SOURCE_DIR}/toxencrypts
304# any potential libvpx linking. 304# any potential libvpx linking.
305message("CMAKE_THREAD_LIBS_INIT: ${CMAKE_THREAD_LIBS_INIT}") 305message("CMAKE_THREAD_LIBS_INIT: ${CMAKE_THREAD_LIBS_INIT}")
306if(CMAKE_THREAD_LIBS_INIT) 306if(CMAKE_THREAD_LIBS_INIT)
307 set(toxcore_LINK_MODULES ${toxcore_LINK_MODULES} ${CMAKE_THREAD_LIBS_INIT}) 307 set(toxcore_LINK_MODULES ${toxcore_LINK_MODULES} Threads::Threads)
308 set(toxcore_PKGCONFIG_LIBS ${toxcore_PKGCONFIG_LIBS} ${CMAKE_THREAD_LIBS_INIT}) 308 set(toxcore_PKGCONFIG_LIBS ${toxcore_PKGCONFIG_LIBS} ${CMAKE_THREAD_LIBS_INIT})
309endif() 309endif()
310 310
311
312if(NSL_LIBRARIES) 311if(NSL_LIBRARIES)
313 set(toxcore_LINK_MODULES ${toxcore_LINK_MODULES} ${NSL_LIBRARIES}) 312 set(toxcore_LINK_MODULES ${toxcore_LINK_MODULES} ${NSL_LIBRARIES})
314 set(toxcore_PKGCONFIG_LIBS ${toxcore_PKGCONFIG_LIBS} -lnsl) 313 set(toxcore_PKGCONFIG_LIBS ${toxcore_PKGCONFIG_LIBS} -lnsl)