mirror of
https://github.com/microsoft/vcpkg.git
synced 2024-11-30 10:11:19 +08:00
646aa7d8c0
* [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
23 lines
598 B
Diff
23 lines
598 B
Diff
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(
|