blob: 83d50b42501e6863eded4745546bf722743dad6a (
plain)
1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
52
|
diff --git a/CMakeLists.txt b/CMakeLists.txt
index 1676ee7..5231934 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -167,13 +167,13 @@ if(NOT_SUBPROJECT)
"extras/gdbinit"
"extras/lldbinit"
DESTINATION
- ${CMAKE_INSTALL_DATAROOTDIR}/Catch2
+ ${CMAKE_INSTALL_DATAROOTDIR}/catch2
)
endif()
## 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"
)
diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
index 1e3af14..265626c 100644
--- a/src/CMakeLists.txt
+++ b/src/CMakeLists.txt
@@ -402,7 +402,6 @@ if(NOT_SUBPROJECT)
install(
TARGETS
Catch2
- Catch2WithMain
EXPORT
Catch2Targets
LIBRARY DESTINATION
@@ -413,6 +412,19 @@ if(NOT_SUBPROJECT)
${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(
EXPORT
Catch2Targets
|
