Skip to content

Commit 9cd8dcf

Browse files
egorodetegorodet
committed
Fix install paths to lowercase "include" and "lib" directories
1 parent 5bb7c23 commit 9cd8dcf

File tree

27 files changed

+52
-51
lines changed

27 files changed

+52
-51
lines changed

‎CMake/MethaneModules.cmake

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -131,6 +131,7 @@ function(get_module_dirs NAMESPACE)
131131
set(SOURCES_PLATFORM_OS_DIR ${SOURCES_DIR}/${PLATFORM_OS_DIR} PARENT_SCOPE)
132132
set(INCLUDE_GRAPHICS_DIR ${INCLUDE_DIR}/${GRAPHICS_DIR} PARENT_SCOPE)
133133
set(SOURCES_GRAPHICS_DIR ${SOURCES_DIR}/${GRAPHICS_DIR} PARENT_SCOPE)
134+
set(INSTALL_INCLUDE_DIR "include/${NAMESPACE}" PARENT_SCOPE)
134135
set(INCLUDE_DIR ${INCLUDE_DIR} PARENT_SCOPE)
135136
set(SOURCES_DIR ${SOURCES_DIR} PARENT_SCOPE)
136137
set(NAMESPACE_DIR ${NAMESPACE} PARENT_SCOPE)

‎Modules/Common/Instrumentation/CMakeLists.txt

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -94,9 +94,9 @@ set_target_properties(${TARGET}
9494

9595
install(TARGETS ${TARGET}
9696
PUBLIC_HEADER
97-
DESTINATION ${INCLUDE_DIR}
97+
DESTINATION ${INSTALL_INCLUDE_DIR}
9898
COMPONENT Development
9999
ARCHIVE
100-
DESTINATION Lib
100+
DESTINATION lib
101101
COMPONENT Development
102102
)

‎Modules/Common/Primitives/CMakeLists.txt

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -46,9 +46,9 @@ set_target_properties(${TARGET}
4646

4747
install(TARGETS ${TARGET}
4848
PUBLIC_HEADER
49-
DESTINATION ${INCLUDE_DIR}
49+
DESTINATION ${INSTALL_INCLUDE_DIR}
5050
COMPONENT Development
5151
ARCHIVE
52-
DESTINATION Lib
52+
DESTINATION lib
5353
COMPONENT Development
5454
)

‎Modules/Data/Animation/CMakeLists.txt

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -51,9 +51,9 @@ set_target_properties(${TARGET}
5151

5252
install(TARGETS ${TARGET}
5353
PUBLIC_HEADER
54-
DESTINATION ${INCLUDE_DIR}
54+
DESTINATION ${INSTALL_INCLUDE_DIR}
5555
COMPONENT Development
5656
ARCHIVE
57-
DESTINATION Lib
57+
DESTINATION lib
5858
COMPONENT Development
5959
)

‎Modules/Data/Events/CMakeLists.txt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -44,6 +44,6 @@ source_group(TREE ${CMAKE_CURRENT_SOURCE_DIR} FILES ${SOURCES})
4444

4545
install(TARGETS ${TARGET}
4646
PUBLIC_HEADER
47-
DESTINATION ${INCLUDE_DIR}
47+
DESTINATION ${INSTALL_INCLUDE_DIR}
4848
COMPONENT Development
4949
)

‎Modules/Data/Primitives/CMakeLists.txt

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -56,9 +56,9 @@ set_target_properties(${TARGET}
5656

5757
install(TARGETS ${TARGET}
5858
PUBLIC_HEADER
59-
DESTINATION ${INCLUDE_DIR}
59+
DESTINATION ${INSTALL_INCLUDE_DIR}
6060
COMPONENT Development
6161
ARCHIVE
62-
DESTINATION Lib
62+
DESTINATION lib
6363
COMPONENT Development
6464
)

‎Modules/Data/Provider/CMakeLists.txt

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -49,9 +49,9 @@ set_target_properties(${TARGET}
4949

5050
install(TARGETS ${TARGET}
5151
PUBLIC_HEADER
52-
DESTINATION ${INCLUDE_DIR}
52+
DESTINATION ${INSTALL_INCLUDE_DIR}
5353
COMPONENT Development
5454
ARCHIVE
55-
DESTINATION Lib
55+
DESTINATION lib
5656
COMPONENT Development
5757
)

‎Modules/Data/Types/CMakeLists.txt

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -52,9 +52,9 @@ set_target_properties(${TARGET}
5252

5353
install(TARGETS ${TARGET}
5454
PUBLIC_HEADER
55-
DESTINATION ${INCLUDE_DIR}
55+
DESTINATION ${INSTALL_INCLUDE_DIR}
5656
COMPONENT Development
5757
ARCHIVE
58-
DESTINATION Lib
58+
DESTINATION lib
5959
COMPONENT Development
6060
)

‎Modules/Graphics/App/CMakeLists.txt

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -61,9 +61,9 @@ source_group(TREE ${CMAKE_CURRENT_SOURCE_DIR} FILES ${HEADERS} ${SOURCES})
6161

6262
install(TARGETS ${TARGET}
6363
PUBLIC_HEADER
64-
DESTINATION ${INCLUDE_DIR}
64+
DESTINATION ${INSTALL_INCLUDE_DIR}
6565
COMPONENT Development
6666
ARCHIVE
67-
DESTINATION Lib
67+
DESTINATION lib
6868
COMPONENT Development
6969
)

‎Modules/Graphics/Camera/CMakeLists.txt

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -52,9 +52,9 @@ set_target_properties(${TARGET}
5252

5353
install(TARGETS ${TARGET}
5454
PUBLIC_HEADER
55-
DESTINATION ${INCLUDE_DIR}
55+
DESTINATION ${INSTALL_INCLUDE_DIR}
5656
COMPONENT Development
5757
ARCHIVE
58-
DESTINATION Lib
58+
DESTINATION lib
5959
COMPONENT Development
6060
)

‎Modules/Graphics/Mesh/CMakeLists.txt

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -54,9 +54,9 @@ set_target_properties(${TARGET}
5454

5555
install(TARGETS ${TARGET}
5656
PUBLIC_HEADER
57-
DESTINATION ${INCLUDE_DIR}
57+
DESTINATION ${INSTALL_INCLUDE_DIR}
5858
COMPONENT Development
5959
ARCHIVE
60-
DESTINATION Lib
60+
DESTINATION lib
6161
COMPONENT Development
6262
)

‎Modules/Graphics/Primitives/CMakeLists.txt

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -122,9 +122,9 @@ set_target_properties(${TARGET}
122122

123123
install(TARGETS ${TARGET}
124124
PUBLIC_HEADER
125-
DESTINATION ${INCLUDE_DIR}
125+
DESTINATION ${INSTALL_INCLUDE_DIR}
126126
COMPONENT Development
127127
ARCHIVE
128-
DESTINATION Lib
128+
DESTINATION lib
129129
COMPONENT Development
130130
)

‎Modules/Graphics/RHI/Impl/CMakeLists.txt

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -177,10 +177,10 @@ set_target_properties(${TARGET}
177177

178178
install(TARGETS ${TARGET}
179179
PUBLIC_HEADER
180-
DESTINATION ${INCLUDE_DIR}
180+
DESTINATION ${INSTALL_INCLUDE_DIR}
181181
COMPONENT Development
182182
ARCHIVE
183-
DESTINATION Lib
183+
DESTINATION lib
184184
COMPONENT Development
185185
)
186186

‎Modules/Graphics/RHI/Interface/CMakeLists.txt

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -126,9 +126,9 @@ set_target_properties(${TARGET}
126126

127127
install(TARGETS ${TARGET}
128128
PUBLIC_HEADER
129-
DESTINATION ${INCLUDE_DIR}
129+
DESTINATION ${INSTALL_INCLUDE_DIR}
130130
COMPONENT Development
131131
ARCHIVE
132-
DESTINATION Lib
132+
DESTINATION lib
133133
COMPONENT Development
134134
)

‎Modules/Graphics/Types/CMakeLists.txt

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -54,10 +54,10 @@ set_target_properties(${TARGET}
5454

5555
install(TARGETS ${TARGET}
5656
PUBLIC_HEADER
57-
DESTINATION ${INCLUDE_DIR}
57+
DESTINATION ${INSTALL_INCLUDE_DIR}
5858
COMPONENT Development
5959
ARCHIVE
60-
DESTINATION Lib
60+
DESTINATION lib
6161
COMPONENT Development
6262
)
6363

‎Modules/Kit/CMakeLists.txt

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -65,12 +65,12 @@ set_target_properties(${TARGET}
6565

6666
install(TARGETS ${TARGET}
6767
INCLUDES
68-
DESTINATION ${INCLUDE_DIR}
68+
DESTINATION ${INSTALL_INCLUDE_DIR}
6969
COMPONENT Development
7070
PUBLIC_HEADER
71-
DESTINATION ${INCLUDE_DIR}
71+
DESTINATION ${INSTALL_INCLUDE_DIR}
7272
COMPONENT Development
7373
ARCHIVE
74-
DESTINATION Lib
74+
DESTINATION lib
7575
COMPONENT Development
7676
)

‎Modules/Platform/App/CMakeLists.txt

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -142,10 +142,10 @@ endif()
142142

143143
install(TARGETS ${TARGET}
144144
PUBLIC_HEADER
145-
DESTINATION ${INCLUDE_DIR}
145+
DESTINATION ${INSTALL_INCLUDE_DIR}
146146
COMPONENT Development
147147
ARCHIVE
148-
DESTINATION Lib
148+
DESTINATION lib
149149
COMPONENT Development
150150
)
151151

‎Modules/Platform/AppView/CMakeLists.txt

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -98,10 +98,10 @@ endif()
9898

9999
install(TARGETS ${TARGET}
100100
PUBLIC_HEADER
101-
DESTINATION ${INCLUDE_DIR}
101+
DESTINATION ${INSTALL_INCLUDE_DIR}
102102
COMPONENT Development
103103
ARCHIVE
104-
DESTINATION Lib
104+
DESTINATION lib
105105
COMPONENT Development
106106
)
107107

‎Modules/Platform/Input/ActionControllers/CMakeLists.txt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -39,6 +39,6 @@ set_target_properties(${TARGET}
3939

4040
install(TARGETS ${TARGET}
4141
PUBLIC_HEADER
42-
DESTINATION ${INCLUDE_DIR}
42+
DESTINATION ${INSTALL_INCLUDE_DIR}
4343
COMPONENT Development
4444
)

‎Modules/Platform/Input/Controllers/CMakeLists.txt

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -54,9 +54,9 @@ set_target_properties(${TARGET}
5454

5555
install(TARGETS ${TARGET}
5656
PUBLIC_HEADER
57-
DESTINATION ${INCLUDE_DIR}
57+
DESTINATION ${INSTALL_INCLUDE_DIR}
5858
COMPONENT Development
5959
ARCHIVE
60-
DESTINATION Lib
60+
DESTINATION lib
6161
COMPONENT Development
6262
)

‎Modules/Platform/Input/Keyboard/CMakeLists.txt

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -67,9 +67,9 @@ endif()
6767

6868
install(TARGETS ${TARGET}
6969
PUBLIC_HEADER
70-
DESTINATION ${INCLUDE_DIR}
70+
DESTINATION ${INSTALL_INCLUDE_DIR}
7171
COMPONENT Development
7272
ARCHIVE
73-
DESTINATION Lib
73+
DESTINATION lib
7474
COMPONENT Development
7575
)

‎Modules/Platform/Input/Mouse/CMakeLists.txt

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -42,9 +42,9 @@ set_target_properties(${TARGET}
4242

4343
install(TARGETS ${TARGET}
4444
PUBLIC_HEADER
45-
DESTINATION ${INCLUDE_DIR}
45+
DESTINATION ${INSTALL_INCLUDE_DIR}
4646
COMPONENT Development
4747
ARCHIVE
48-
DESTINATION Lib
48+
DESTINATION lib
4949
COMPONENT Development
5050
)

‎Modules/Platform/Utils/CMakeLists.txt

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -88,10 +88,10 @@ endif()
8888

8989
install(TARGETS ${TARGET}
9090
PUBLIC_HEADER
91-
DESTINATION ${INCLUDE_DIR}
91+
DESTINATION ${INSTALL_INCLUDE_DIR}
9292
COMPONENT Development
9393
ARCHIVE
94-
DESTINATION Lib
94+
DESTINATION lib
9595
COMPONENT Development
9696
)
9797

‎Modules/UserInterface/App/CMakeLists.txt

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -68,10 +68,10 @@ source_group(TREE ${CMAKE_CURRENT_SOURCE_DIR} FILES ${HEADERS} ${SOURCES})
6868

6969
install(TARGETS ${TARGET}
7070
PUBLIC_HEADER
71-
DESTINATION ${INCLUDE_DIR}
71+
DESTINATION ${INSTALL_INCLUDE_DIR}
7272
COMPONENT Development
7373
ARCHIVE
74-
DESTINATION Lib
74+
DESTINATION lib
7575
COMPONENT Development
7676
)
7777

‎Modules/UserInterface/Types/CMakeLists.txt

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -54,10 +54,10 @@ set_target_properties(${TARGET}
5454

5555
install(TARGETS ${TARGET}
5656
PUBLIC_HEADER
57-
DESTINATION ${INCLUDE_DIR}
57+
DESTINATION ${INSTALL_INCLUDE_DIR}
5858
COMPONENT Development
5959
ARCHIVE
60-
DESTINATION Lib
60+
DESTINATION lib
6161
COMPONENT Development
6262
)
6363

‎Modules/UserInterface/Typography/CMakeLists.txt

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -78,10 +78,10 @@ set_target_properties(${TARGET}
7878

7979
install(TARGETS ${TARGET}
8080
PUBLIC_HEADER
81-
DESTINATION ${INCLUDE_DIR}
81+
DESTINATION ${INSTALL_INCLUDE_DIR}
8282
COMPONENT Development
8383
ARCHIVE
84-
DESTINATION Lib
84+
DESTINATION lib
8585
COMPONENT Development
8686
)
8787

‎Modules/UserInterface/Widgets/CMakeLists.txt

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -58,10 +58,10 @@ set_target_properties(${TARGET}
5858

5959
install(TARGETS ${TARGET}
6060
PUBLIC_HEADER
61-
DESTINATION ${INCLUDE_DIR}
61+
DESTINATION ${INSTALL_INCLUDE_DIR}
6262
COMPONENT Development
6363
ARCHIVE
64-
DESTINATION Lib
64+
DESTINATION lib
6565
COMPONENT Development
6666
)
6767

0 commit comments

Comments
 (0)