From 0647c2c5bc8c871dbcaed64de40eb252d13d303c Mon Sep 17 00:00:00 2001 From: Robin Lindén Date: Sun, 11 Feb 2018 13:38:40 +0100 Subject: Look for dependencies in third_party/ --- cmake/Dependencies.cmake | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) (limited to 'cmake/Dependencies.cmake') diff --git a/cmake/Dependencies.cmake b/cmake/Dependencies.cmake index 72c43b40..b3e57e50 100644 --- a/cmake/Dependencies.cmake +++ b/cmake/Dependencies.cmake @@ -33,8 +33,8 @@ pkg_use_module(SNDFILE sndfile ) # :: For MSVC Windows builds. # # These require specific installation paths of dependencies: -# - libsodium in libsodium/Win32/Release/v140/dynamic -# - pthreads in pthreads-win32/Pre-built.2 +# - libsodium in third-party/libsodium/Win32/Release/v140/dynamic +# - pthreads in third-party/pthreads-win32/Pre-built.2 # ############################################################################### @@ -44,11 +44,11 @@ if(MSVC) find_library(LIBSODIUM_LIBRARIES NAMES sodium libsodium PATHS - "libsodium/Win32/Release/v140/dynamic" - "libsodium/x64/Release/v140/dynamic" + "third_party/libsodium/Win32/Release/v140/dynamic" + "third_party/libsodium/x64/Release/v140/dynamic" ) if(LIBSODIUM_LIBRARIES) - include_directories("libsodium/include") + include_directories("third_party/libsodium/include") set(LIBSODIUM_FOUND TRUE) message("libsodium: ${LIBSODIUM_LIBRARIES}") else() @@ -61,11 +61,11 @@ if(MSVC) find_library(CMAKE_THREAD_LIBS_INIT NAMES pthreadVC2 PATHS - "pthreads-win32/Pre-built.2/lib/x86" - "pthreads-win32/Pre-built.2/lib/x64" + "third_party/pthreads-win32/Pre-built.2/lib/x86" + "third_party/pthreads-win32/Pre-built.2/lib/x64" ) if(CMAKE_THREAD_LIBS_INIT) - include_directories("pthreads-win32/Pre-built.2/include") + include_directories("third_party/pthreads-win32/Pre-built.2/include") add_definitions(-DHAVE_STRUCT_TIMESPEC) message("libpthreads: ${CMAKE_THREAD_LIBS_INIT}") else() -- cgit v1.2.3