mirror of
https://github.com/microsoft/vcpkg.git
synced 2024-12-13 17:44:09 +08:00
46 lines
1.1 KiB
Diff
46 lines
1.1 KiB
Diff
diff --git a/CMakeLists.txt b/CMakeLists.txt
|
|
--- a/CMakeLists.txt
|
|
+++ b/CMakeLists.txt
|
|
@@ -164,7 +164,7 @@
|
|
|
|
## 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(
|
|
diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
|
|
--- a/src/CMakeLists.txt
|
|
+++ b/src/CMakeLists.txt
|
|
@@ -401,16 +401,28 @@
|
|
install(
|
|
TARGETS
|
|
Catch2
|
|
- Catch2WithMain
|
|
EXPORT
|
|
Catch2Targets
|
|
LIBRARY DESTINATION
|
|
${CMAKE_INSTALL_LIBDIR}
|
|
ARCHIVE DESTINATION
|
|
${CMAKE_INSTALL_LIBDIR}
|
|
RUNTIME DESTINATION
|
|
${CMAKE_INSTALL_BINDIR}
|
|
)
|
|
+
|
|
+ install(
|
|
+ TARGETS
|
|
+ Catch2WithMain
|
|
+ EXPORT
|
|
+ Catch2Targets
|
|
+ LIBRARY DESTINATION
|
|
+ ${CMAKE_INSTALL_LIBDIR}/manual-link
|
|
+ ARCHIVE DESTINATION
|
|
+ ${CMAKE_INSTALL_LIBDIR}/manual-link
|
|
+ RUNTIME DESTINATION
|
|
+ ${CMAKE_INSTALL_BINDIR}
|
|
+ )
|
|
|
|
|
|
install(
|