diff options
| author |  David Marcec | 2018-08-11 10:35:47 +1000 |
|---|---|---|
| committer | David Marcec | 2018-08-11 10:35:47 +1000 |
| commit | b76ddb7647cbb390cce4143d91a1db171b0fa503 (patch) | |
| tree | a6e2e334e82b035923c41458150604dd5fb31d65 /externals | |
| parent | Added IsUserRegistrationRequestPermitted (diff) | |
| parent | Merge pull request #1007 from MerryMage/dynarmic (diff) | |
| download | yuzu-b76ddb7647cbb390cce4143d91a1db171b0fa503.tar.gz yuzu-b76ddb7647cbb390cce4143d91a1db171b0fa503.tar.xz yuzu-b76ddb7647cbb390cce4143d91a1db171b0fa503.zip | |
Merge remote-tracking branch 'origin/master' into better-account
Diffstat (limited to 'externals')
| -rw-r--r-- | externals/CMakeLists.txt | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/externals/CMakeLists.txt b/externals/CMakeLists.txt index db21f3d50..b6eb36f20 100644 --- a/externals/CMakeLists.txt +++ b/externals/CMakeLists.txt | |||
| @@ -32,7 +32,7 @@ add_subdirectory(inih) | |||
| 32 | 32 | ||
| 33 | # lz4 | 33 | # lz4 |
| 34 | set(LZ4_BUNDLED_MODE ON) | 34 | set(LZ4_BUNDLED_MODE ON) |
| 35 | add_subdirectory(lz4/contrib/cmake_unofficial) | 35 | add_subdirectory(lz4/contrib/cmake_unofficial EXCLUDE_FROM_ALL) |
| 36 | target_include_directories(lz4_static INTERFACE ./lz4/lib) | 36 | target_include_directories(lz4_static INTERFACE ./lz4/lib) |
| 37 | 37 | ||
| 38 | # mbedtls | 38 | # mbedtls |