diff options
| author | NancyLi1013 <46708020+NancyLi1013@users.noreply.github.com> | 2021-08-10 15:59:01 +0800 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2021-08-10 00:59:01 -0700 |
| commit | 646aa7d8c0e62eb056aa1904b08664f663d7864e (patch) | |
| tree | 07c2411d27d57b4d549f92cc9c2bab8fc31b1c67 /ports/catch2/fix-install-path.patch | |
| parent | 3a37cc46f67334817a36cdf122dcbb58b1b1acea (diff) | |
| download | vcpkg-646aa7d8c0e62eb056aa1904b08664f663d7864e.tar.gz vcpkg-646aa7d8c0e62eb056aa1904b08664f663d7864e.zip | |
[catch2] Support static build (#19396)
* [catch2] Update to 1.13.7 and support static build
* Update version files
* Revert the new version update changes
* Update version files
* Update versions/c-/catch2.json
* Fix install path for lib and pkgconfig
* Update versions/c-/catch2.json
Diffstat (limited to 'ports/catch2/fix-install-path.patch')
| -rw-r--r-- | ports/catch2/fix-install-path.patch | 22 |
1 files changed, 22 insertions, 0 deletions
diff --git a/ports/catch2/fix-install-path.patch b/ports/catch2/fix-install-path.patch new file mode 100644 index 000000000..c60e74b93 --- /dev/null +++ b/ports/catch2/fix-install-path.patch @@ -0,0 +1,22 @@ +diff --git a/CMakeLists.txt b/CMakeLists.txt +index 0370ea3..7cef01a 100644 +--- a/CMakeLists.txt ++++ b/CMakeLists.txt +@@ -146,7 +146,7 @@ if (NOT_SUBPROJECT) + EXPORT + Catch2Targets + DESTINATION +- ${CMAKE_INSTALL_LIBDIR} ++ ${CMAKE_INSTALL_LIBDIR}/manual-link + ) + + +@@ -226,7 +226,7 @@ if (NOT_SUBPROJECT) + + ## Provide some pkg-config integration + set(PKGCONFIG_INSTALL_DIR +- "${CMAKE_INSTALL_DATAROOTDIR}/pkgconfig" ++ "${CMAKE_INSTALL_LIBDIR}/pkgconfig" + CACHE PATH "Path where catch2.pc is installed" + ) + configure_file( |