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/find-modules/FindCatch2.cmake | 35 +++++++++++++++++++++++++++++++++ 1 file changed, 35 insertions(+) create mode 100644 externals/find-modules/FindCatch2.cmake (limited to 'externals/find-modules/FindCatch2.cmake') diff --git a/externals/find-modules/FindCatch2.cmake b/externals/find-modules/FindCatch2.cmake new file mode 100644 index 000000000..a83c668bf --- /dev/null +++ b/externals/find-modules/FindCatch2.cmake @@ -0,0 +1,35 @@ + +find_package(PkgConfig QUIET) +pkg_check_modules(PC_Catch2 QUIET Catch2) + +find_path(Catch2_INCLUDE_DIR + NAMES catch.hpp + PATHS ${PC_Catch2_INCLUDE_DIRS} ${CONAN_CATCH2_ROOT} + PATH_SUFFIXES catch2 +) + +include(FindPackageHandleStandardArgs) +find_package_handle_standard_args(Catch2 + FOUND_VAR Catch2_FOUND + REQUIRED_VARS + Catch2_INCLUDE_DIR + VERSION_VAR Catch2_VERSION +) + +if(Catch2_FOUND) + set(Catch2_INCLUDE_DIRS ${Catch2_INCLUDE_DIR}) + set(Catch2_DEFINITIONS ${PC_Catch2_CFLAGS_OTHER}) +endif() + +if(Catch2_FOUND AND NOT TARGET Catch2::Catch2) + add_library(Catch2::Catch2 UNKNOWN IMPORTED) + set_target_properties(Catch2::Catch2 PROPERTIES + IMPORTED_LOCATION "${Catch2_LIBRARY}" + INTERFACE_COMPILE_OPTIONS "${PC_Catch2_CFLAGS_OTHER}" + INTERFACE_INCLUDE_DIRECTORIES "${Catch2_INCLUDE_DIR}" + ) +endif() + +mark_as_advanced( + Catch2_INCLUDE_DIR +) -- cgit v1.2.3