diff options
| author | Morph <39850852+Morph1984@users.noreply.github.com> | 2021-09-29 02:47:14 +0200 |
|---|---|---|
| committer | Morph <39850852+Morph1984@users.noreply.github.com> | 2021-09-29 05:18:39 +0200 |
| commit | 5f6cd32c9e63ebbda120063cb9a282a7f1374d4d (patch) | |
| tree | 57f834fb894094e3ef88f322dc4f18fabe83a749 /CMakeLists.txt | |
| parent | file_sys: Remove vfs_libzip (diff) | |
| download | yuzu-5f6cd32c9e63ebbda120063cb9a282a7f1374d4d.tar yuzu-5f6cd32c9e63ebbda120063cb9a282a7f1374d4d.tar.gz yuzu-5f6cd32c9e63ebbda120063cb9a282a7f1374d4d.tar.bz2 yuzu-5f6cd32c9e63ebbda120063cb9a282a7f1374d4d.tar.lz yuzu-5f6cd32c9e63ebbda120063cb9a282a7f1374d4d.tar.xz yuzu-5f6cd32c9e63ebbda120063cb9a282a7f1374d4d.tar.zst yuzu-5f6cd32c9e63ebbda120063cb9a282a7f1374d4d.zip | |
Diffstat (limited to 'CMakeLists.txt')
| -rw-r--r-- | CMakeLists.txt | 5 |
1 files changed, 0 insertions, 5 deletions
diff --git a/CMakeLists.txt b/CMakeLists.txt index b7ea86d8a..5c3142a6e 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -422,11 +422,6 @@ if (CONAN_REQUIRED_LIBS) endif() include(${CMAKE_BINARY_DIR}/conan.cmake) - set(CONAN_LIB_OPTIONS - libzip:with_openssl=False - libzip:enable_windows_crypto=False - ) - conan_check(VERSION 1.24.0 REQUIRED) # Manually add iconv to fix a dep conflict between qt and sdl2 |