blob: 150907112a8dccbb405a8bda9f289a4c75908339 (
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
53
54
55
56
57
58
59
60
61
62
63
64
65
66
67
68
69
70
71
72
73
74
75
76
77
78
79
|
diff --git a/CMakeLists.txt b/CMakeLists.txt
index ac81279..cfc2f3b 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -299,7 +299,7 @@ endif()
# Common configuration file
#
configure_file("${PROJECT_SOURCE_DIR}/src/config.h.in" "${PROJECT_BINARY_DIR}/include/sail-common/config.h" @ONLY)
-install(FILES "${PROJECT_BINARY_DIR}/include/sail-common/config.h" DESTINATION include/sail/sail-common)
+install(FILES "${PROJECT_BINARY_DIR}/include/sail-common/config.h" DESTINATION include/sail-common)
# Print configuration statistics
#
diff --git a/src/bindings/sail-c++/CMakeLists.txt b/src/bindings/sail-c++/CMakeLists.txt
index 4b69ad4..f4bac29 100644
--- a/src/bindings/sail-c++/CMakeLists.txt
+++ b/src/bindings/sail-c++/CMakeLists.txt
@@ -131,7 +131,7 @@ install(TARGETS sail-c++
ARCHIVE DESTINATION "${CMAKE_INSTALL_LIBDIR}"
LIBRARY DESTINATION "${CMAKE_INSTALL_LIBDIR}"
RUNTIME DESTINATION "${CMAKE_INSTALL_BINDIR}"
- PUBLIC_HEADER DESTINATION "${CMAKE_INSTALL_INCLUDEDIR}/sail/sail-c++")
+ PUBLIC_HEADER DESTINATION "${CMAKE_INSTALL_INCLUDEDIR}/sail-c++")
# Install development packages
#
diff --git a/src/sail-common/CMakeLists.txt b/src/sail-common/CMakeLists.txt
index 06ce246..c8576e5 100644
--- a/src/sail-common/CMakeLists.txt
+++ b/src/sail-common/CMakeLists.txt
@@ -114,7 +114,7 @@ endif()
target_include_directories(sail-common
PUBLIC $<BUILD_INTERFACE:${CMAKE_CURRENT_SOURCE_DIR}/..>
- $<INSTALL_INTERFACE:include/sail>)
+ $<INSTALL_INTERFACE:include>)
# pkg-config integration
#
@@ -129,7 +129,7 @@ install(TARGETS sail-common
ARCHIVE DESTINATION "${CMAKE_INSTALL_LIBDIR}"
LIBRARY DESTINATION "${CMAKE_INSTALL_LIBDIR}"
RUNTIME DESTINATION "${CMAKE_INSTALL_BINDIR}"
- PUBLIC_HEADER DESTINATION "${CMAKE_INSTALL_INCLUDEDIR}/sail/sail-common")
+ PUBLIC_HEADER DESTINATION "${CMAKE_INSTALL_INCLUDEDIR}/sail-common")
# Install development packages
#
diff --git a/src/sail-manip/CMakeLists.txt b/src/sail-manip/CMakeLists.txt
index 5740764..47b81bb 100644
--- a/src/sail-manip/CMakeLists.txt
+++ b/src/sail-manip/CMakeLists.txt
@@ -59,7 +59,7 @@ install(TARGETS sail-manip
ARCHIVE DESTINATION "${CMAKE_INSTALL_LIBDIR}"
LIBRARY DESTINATION "${CMAKE_INSTALL_LIBDIR}"
RUNTIME DESTINATION "${CMAKE_INSTALL_BINDIR}"
- PUBLIC_HEADER DESTINATION "${CMAKE_INSTALL_INCLUDEDIR}/sail/sail-manip")
+ PUBLIC_HEADER DESTINATION "${CMAKE_INSTALL_INCLUDEDIR}/sail-manip")
# Install development packages
#
diff --git a/src/sail/CMakeLists.txt b/src/sail/CMakeLists.txt
index 85590af..2303f63 100644
--- a/src/sail/CMakeLists.txt
+++ b/src/sail/CMakeLists.txt
@@ -118,11 +118,11 @@ install(TARGETS sail
ARCHIVE DESTINATION "${CMAKE_INSTALL_LIBDIR}"
LIBRARY DESTINATION "${CMAKE_INSTALL_LIBDIR}"
RUNTIME DESTINATION "${CMAKE_INSTALL_BINDIR}"
- PUBLIC_HEADER DESTINATION "${CMAKE_INSTALL_INCLUDEDIR}/sail/sail")
+ PUBLIC_HEADER DESTINATION "${CMAKE_INSTALL_INCLUDEDIR}/sail")
# Install layouts for debugging codecs
#
-install(DIRECTORY "${CMAKE_CURRENT_SOURCE_DIR}/layout/" DESTINATION "${CMAKE_INSTALL_INCLUDEDIR}/sail/sail/layout")
+install(DIRECTORY "${CMAKE_CURRENT_SOURCE_DIR}/layout/" DESTINATION "${CMAKE_INSTALL_INCLUDEDIR}/sail/layout")
# Install development packages
#
|