suyu/dynarmic
28
1
Fork 1
Code Issues Pull requests Projects Releases Packages Wiki Activity

externals: Integrate catch external

Browse source
This commit is contained in:
Merry 2022-12-31 16:32:10 +00:00
parent 3dce8d1984
commit b4e74c079c
2 changed files with 13 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
externals/CMakeLists.txt vendored
View file

@ -14,6 +14,16 @@ set(BUILD_TESTING OFF)
# simply add the directory to that file as a subdirectory # simply add the directory to that file as a subdirectory
# to have CMake automatically recognize them. # to have CMake automatically recognize them.
# catch
if (NOT TARGET Catch2::Catch2WithMain)
if (DYNARMIC_TESTS)
add_subdirectory(catch EXCLUDE_FROM_ALL)
list(APPEND CMAKE_MODULE_PATH "${PROJECT_SOURCE_DIR}/externals/catch/extras")
set(CMAKE_MODULE_PATH ${CMAKE_MODULE_PATH} PARENT_SCOPE)
endif()
endif()
# fmt # fmt
if (NOT TARGET fmt::fmt) if (NOT TARGET fmt::fmt)

3
externals/README.md vendored
View file

@ -3,6 +3,7 @@ This repository uses subtrees to manage some of its externals.
## Initial setup ## Initial setup
``` ```
git remote add externals-catch https://github.com/catchorg/Catch2.git --no-tags
git remote add externals-fmt https://github.com/fmtlib/fmt.git --no-tags git remote add externals-fmt https://github.com/fmtlib/fmt.git --no-tags
git remote add externals-mcl https://github.com/merryhime/mcl.git --no-tags git remote add externals-mcl https://github.com/merryhime/mcl.git --no-tags
git remote add externals-oaknut https://github.com/merryhime/oaknut.git --no-tags git remote add externals-oaknut https://github.com/merryhime/oaknut.git --no-tags
@ -17,6 +18,7 @@ git remote add externals-zydis https://github.com/zyantific/zydis.git --no-tags
Change `<ref>` to refer to the appropriate git reference. Change `<ref>` to refer to the appropriate git reference.
``` ```
git fetch externals-catch
git fetch externals-fmt git fetch externals-fmt
git fetch externals-mcl git fetch externals-mcl
git fetch externals-oaknut git fetch externals-oaknut
@ -24,6 +26,7 @@ git fetch externals-robin-map
git fetch externals-xbyak git fetch externals-xbyak
git fetch externals-zycore git fetch externals-zycore
git fetch externals-zydis git fetch externals-zydis
git subtree pull --squash --prefix=externals/catch externals-catch <ref>
git subtree pull --squash --prefix=externals/fmt externals-fmt <ref> git subtree pull --squash --prefix=externals/fmt externals-fmt <ref>
git subtree pull --squash --prefix=externals/mcl externals-mcl <ref> git subtree pull --squash --prefix=externals/mcl externals-mcl <ref>
git subtree pull --squash --prefix=externals/oaknut externals-oaknut <ref> git subtree pull --squash --prefix=externals/oaknut externals-oaknut <ref>