From bc30a591ba7252e0c16d9c1b3c75a7073735bcae Mon Sep 17 00:00:00 2001 From: James Rowe Date: Fri, 8 May 2020 15:09:29 -0600 Subject: 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 --- externals/cmake-modules/FindUnicorn.cmake | 18 ------------------ 1 file changed, 18 deletions(-) delete mode 100644 externals/cmake-modules/FindUnicorn.cmake (limited to 'externals/cmake-modules') 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) -- cgit v1.2.3