38 lines
835 B
Diff
38 lines
835 B
Diff
|
diff --git a/CMakeLists.txt b/CMakeLists.txt
|
||
|
|
--- a/CMakeLists.txt
|
||
|
|
+++ b/CMakeLists.txt
|
||
|
|
@@ -168,7 +168,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
|
||
|
|
@@ -335,12 +335,20 @@
|
||
|
|
install(
|
||
|
|
TARGETS
|
||
|
|
Catch2
|
||
|
|
- Catch2WithMain
|
||
|
|
EXPORT
|
||
|
|
Catch2Targets
|
||
|
|
DESTINATION
|
||
|
|
${CMAKE_INSTALL_LIBDIR}
|
||
|
|
)
|
||
|
|
+
|
||
|
|
+ install(
|
||
|
|
+ TARGETS
|
||
|
|
+ Catch2WithMain
|
||
|
|
+ EXPORT
|
||
|
|
+ Catch2Targets
|
||
|
|
+ DESTINATION
|
||
|
|
+ ${CMAKE_INSTALL_LIBDIR}/manual-link
|
||
|
|
+ )
|
||
|
|
|
||
|
|
|
||
|
|
install(
|