diff options
author | Robin Lindén <dev@robinlinden.eu> | 2018-02-11 13:38:40 +0100 |
---|---|---|
committer | Robin Lindén <dev@robinlinden.eu> | 2018-02-11 13:45:52 +0100 |
commit | 0647c2c5bc8c871dbcaed64de40eb252d13d303c (patch) | |
tree | bd042460bf2981b7854774ace373034cb47254f1 /cmake | |
parent | 2e74db5447f89745f4bdc375230e20a7247670a0 (diff) |
Look for dependencies in third_party/
Diffstat (limited to 'cmake')
-rw-r--r-- | cmake/Dependencies.cmake | 16 |
1 files changed, 8 insertions, 8 deletions
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 ) | |||
33 | # :: For MSVC Windows builds. | 33 | # :: For MSVC Windows builds. |
34 | # | 34 | # |
35 | # These require specific installation paths of dependencies: | 35 | # These require specific installation paths of dependencies: |
36 | # - libsodium in libsodium/Win32/Release/v140/dynamic | 36 | # - libsodium in third-party/libsodium/Win32/Release/v140/dynamic |
37 | # - pthreads in pthreads-win32/Pre-built.2 | 37 | # - pthreads in third-party/pthreads-win32/Pre-built.2 |
38 | # | 38 | # |
39 | ############################################################################### | 39 | ############################################################################### |
40 | 40 | ||
@@ -44,11 +44,11 @@ if(MSVC) | |||
44 | find_library(LIBSODIUM_LIBRARIES | 44 | find_library(LIBSODIUM_LIBRARIES |
45 | NAMES sodium libsodium | 45 | NAMES sodium libsodium |
46 | PATHS | 46 | PATHS |
47 | "libsodium/Win32/Release/v140/dynamic" | 47 | "third_party/libsodium/Win32/Release/v140/dynamic" |
48 | "libsodium/x64/Release/v140/dynamic" | 48 | "third_party/libsodium/x64/Release/v140/dynamic" |
49 | ) | 49 | ) |
50 | if(LIBSODIUM_LIBRARIES) | 50 | if(LIBSODIUM_LIBRARIES) |
51 | include_directories("libsodium/include") | 51 | include_directories("third_party/libsodium/include") |
52 | set(LIBSODIUM_FOUND TRUE) | 52 | set(LIBSODIUM_FOUND TRUE) |
53 | message("libsodium: ${LIBSODIUM_LIBRARIES}") | 53 | message("libsodium: ${LIBSODIUM_LIBRARIES}") |
54 | else() | 54 | else() |
@@ -61,11 +61,11 @@ if(MSVC) | |||
61 | find_library(CMAKE_THREAD_LIBS_INIT | 61 | find_library(CMAKE_THREAD_LIBS_INIT |
62 | NAMES pthreadVC2 | 62 | NAMES pthreadVC2 |
63 | PATHS | 63 | PATHS |
64 | "pthreads-win32/Pre-built.2/lib/x86" | 64 | "third_party/pthreads-win32/Pre-built.2/lib/x86" |
65 | "pthreads-win32/Pre-built.2/lib/x64" | 65 | "third_party/pthreads-win32/Pre-built.2/lib/x64" |
66 | ) | 66 | ) |
67 | if(CMAKE_THREAD_LIBS_INIT) | 67 | if(CMAKE_THREAD_LIBS_INIT) |
68 | include_directories("pthreads-win32/Pre-built.2/include") | 68 | include_directories("third_party/pthreads-win32/Pre-built.2/include") |
69 | add_definitions(-DHAVE_STRUCT_TIMESPEC) | 69 | add_definitions(-DHAVE_STRUCT_TIMESPEC) |
70 | message("libpthreads: ${CMAKE_THREAD_LIBS_INIT}") | 70 | message("libpthreads: ${CMAKE_THREAD_LIBS_INIT}") |
71 | else() | 71 | else() |