diff options
| author | James Rowe <jroweboy@gmail.com> | 2020-05-08 15:09:29 -0600 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2020-05-08 17:09:29 -0400 |
| commit | bc30a591ba7252e0c16d9c1b3c75a7073735bcae (patch) | |
| tree | 2e88ab16d60c7df3e665bcf7c75c24683cb07189 /externals/zlib | |
| parent | 50c27d5ae1bfe6cff6f091f07d68ab7b8e394d9d (diff) | |
Replace externals with Conan (#3735)
* Remove git submodules that will be loaded through conan
* Move custom Find modules to their own folder
* Use conan for downloading missing external dependencies
* CI: Change the yuzu source folder user to the user that the containers run on
* Attempt to remove dirty mingw build hack
* Install conan on the msvc build
* Only set release build type when using not using multi config generator
* Re-add qt bundled to workaround an issue with conan qt not downloading prebuilt binaries
* Add workaround for submodules that use legacy CMAKE variables
* Re-add USE_BUNDLED_QT on the msvc build bot
Diffstat (limited to 'externals/zlib')
| -rw-r--r-- | externals/zlib/CMakeLists.txt | 81 | ||||
| m--------- | externals/zlib/zlib | 0 |
2 files changed, 0 insertions, 81 deletions
diff --git a/externals/zlib/CMakeLists.txt b/externals/zlib/CMakeLists.txt deleted file mode 100644 index 0ca32aae4..000000000 --- a/externals/zlib/CMakeLists.txt +++ /dev/null @@ -1,81 +0,0 @@ -project(zlib C) - -include(CheckTypeSize) -include(CheckFunctionExists) -include(CheckIncludeFile) - -check_include_file(sys/types.h HAVE_SYS_TYPES_H) -check_include_file(stdint.h HAVE_STDINT_H) -check_include_file(stddef.h HAVE_STDDEF_H) - -# Check to see if we have large file support -set(CMAKE_REQUIRED_DEFINITIONS -D_LARGEFILE64_SOURCE=1) -# We add these other definitions here because CheckTypeSize.cmake -# in CMake 2.4.x does not automatically do so and we want -# compatibility with CMake 2.4.x. -if(HAVE_SYS_TYPES_H) - list(APPEND CMAKE_REQUIRED_DEFINITIONS -DHAVE_SYS_TYPES_H) -endif() -if(HAVE_STDINT_H) - list(APPEND CMAKE_REQUIRED_DEFINITIONS -DHAVE_STDINT_H) -endif() -if(HAVE_STDDEF_H) - list(APPEND CMAKE_REQUIRED_DEFINITIONS -DHAVE_STDDEF_H) -endif() -check_type_size(off64_t OFF64_T) -if(HAVE_OFF64_T) - add_definitions(-D_LARGEFILE64_SOURCE=1) -endif() -set(CMAKE_REQUIRED_DEFINITIONS) # clear variable - -# Check for fseeko -check_function_exists(fseeko HAVE_FSEEKO) -if(NOT HAVE_FSEEKO) - add_definitions(-DNO_FSEEKO) -endif() - -# Check for unistd.h -check_include_file(unistd.h HAVE_UNISTD_H) -if(HAVE_UNISTD_H) - add_definitions(-DHAVE_UNISTD_H) -endif() - -if(MSVC) - add_definitions(-D_CRT_SECURE_NO_DEPRECATE) - add_definitions(-D_CRT_NONSTDC_NO_DEPRECATE) -endif() - -add_library(z STATIC - zlib/adler32.c - zlib/compress.c - zlib/crc32.c - zlib/crc32.h - zlib/deflate.c - zlib/deflate.h - zlib/gzclose.c - zlib/gzguts.h - zlib/gzlib.c - zlib/gzread.c - zlib/gzwrite.c - zlib/inffast.h - zlib/inffixed.h - zlib/inflate.c - zlib/inflate.h - zlib/infback.c - zlib/inftrees.c - zlib/inftrees.h - zlib/inffast.c - zlib/trees.c - zlib/trees.h - zlib/uncompr.c - zlib/zconf.h - zlib/zlib.h - zlib/zutil.c - zlib/zutil.h -) -add_library(ZLIB::ZLIB ALIAS z) - -target_include_directories(z -PUBLIC - zlib/ -) diff --git a/externals/zlib/zlib b/externals/zlib/zlib deleted file mode 160000 -Subproject cacf7f1d4e3d44d871b605da3b647f07d718623 |