diff options
| author | Brad King <brad.king@kitware.com> | 2023-02-08 16:36:18 (GMT) |
|---|---|---|
| committer | Kitware Robot <kwrobot@kitware.com> | 2023-02-08 16:36:25 (GMT) |
| commit | c36b18a4b608d8277557b1e7b98f587bd3924c95 (patch) | |
| tree | 8769e3d2abe7bdd77547f913aacc02b0a51f8ea4 | |
| parent | fd36f3f111bdf98ed5beb41183f77e2eb7add05d (diff) | |
| parent | 6d48f48d5d47fa79236b407c5bef343e432fd345 (diff) | |
| download | CMake-c36b18a4b608d8277557b1e7b98f587bd3924c95.zip CMake-c36b18a4b608d8277557b1e7b98f587bd3924c95.tar.gz CMake-c36b18a4b608d8277557b1e7b98f587bd3924c95.tar.bz2 | |
Merge topic 'doc-FetchContent-catch2' into release-3.26
6d48f48d5d FetchContent: Bump documented example Catch2 to v3.0.1
Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !8172
| -rw-r--r-- | Help/guide/using-dependencies/index.rst | 2 | ||||
| -rw-r--r-- | Modules/FetchContent.cmake | 6 |
2 files changed, 4 insertions, 4 deletions
diff --git a/Help/guide/using-dependencies/index.rst b/Help/guide/using-dependencies/index.rst index bb519ad..8b270aa 100644 --- a/Help/guide/using-dependencies/index.rst +++ b/Help/guide/using-dependencies/index.rst @@ -277,7 +277,7 @@ for more): FetchContent_Declare( Catch2 GIT_REPOSITORY https://github.com/catchorg/Catch2.git - GIT_TAG de6fe184a9ac1a06895cdd1c9b437f0a0bdf14ad # v2.13.4 + GIT_TAG 605a34765aa5d5ecbf476b4598a862ada971b0cc # v3.0.1 ) FetchContent_MakeAvailable(googletest Catch2) diff --git a/Modules/FetchContent.cmake b/Modules/FetchContent.cmake index 9c828b4..8afb9bc 100644 --- a/Modules/FetchContent.cmake +++ b/Modules/FetchContent.cmake @@ -762,7 +762,7 @@ frameworks are available to the main build: FetchContent_Declare( Catch2 GIT_REPOSITORY https://github.com/catchorg/Catch2.git - GIT_TAG de6fe184a9ac1a06895cdd1c9b437f0a0bdf14ad # v2.13.4 + GIT_TAG 605a34765aa5d5ecbf476b4598a862ada971b0cc # v3.0.1 ) # After the following call, the CMake targets defined by googletest and @@ -796,7 +796,7 @@ to the declared details and leaving FetchContent_Declare( Catch2 GIT_REPOSITORY https://github.com/catchorg/Catch2.git - GIT_TAG de6fe184a9ac1a06895cdd1c9b437f0a0bdf14ad # v2.13.4 + GIT_TAG 605a34765aa5d5ecbf476b4598a862ada971b0cc # v3.0.1 FIND_PACKAGE_ARGS ) @@ -831,7 +831,7 @@ details: FetchContent_Declare( Catch2 GIT_REPOSITORY https://github.com/catchorg/Catch2.git - GIT_TAG de6fe184a9ac1a06895cdd1c9b437f0a0bdf14ad # v2.13.4 + GIT_TAG 605a34765aa5d5ecbf476b4598a862ada971b0cc # v3.0.1 OVERRIDE_FIND_PACKAGE ) |