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/cmake-modules | |
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/cmake-modules')
-rw-r--r-- | externals/cmake-modules/FindUnicorn.cmake | 18 |
1 files changed, 0 insertions, 18 deletions
diff --git a/externals/cmake-modules/FindUnicorn.cmake b/externals/cmake-modules/FindUnicorn.cmake deleted file mode 100644 index a0f2a71f6..000000000 --- a/externals/cmake-modules/FindUnicorn.cmake +++ /dev/null @@ -1,18 +0,0 @@ -# Exports: -# LIBUNICORN_FOUND -# LIBUNICORN_INCLUDE_DIR -# LIBUNICORN_LIBRARY - -find_path(LIBUNICORN_INCLUDE_DIR - unicorn/unicorn.h - HINTS $ENV{UNICORNDIR} - PATH_SUFFIXES include) - -find_library(LIBUNICORN_LIBRARY - NAMES unicorn - HINTS $ENV{UNICORNDIR}) - -include(FindPackageHandleStandardArgs) -find_package_handle_standard_args(unicorn DEFAULT_MSG - LIBUNICORN_LIBRARY LIBUNICORN_INCLUDE_DIR) -mark_as_advanced(LIBUNICORN_INCLUDE_DIR LIBUNICORN_LIBRARY) |