Fix install paths to lowercase "include" and "lib" directories

egorodet · egorodet · commit 9cd8dcf90f52 · 2025-05-07T10:35:19.000+03:00
diff --git a/CMake/MethaneModules.cmake b/CMake/MethaneModules.cmake
@@ -131,6 +131,7 @@ function(get_module_dirs NAMESPACE)
     set(SOURCES_PLATFORM_OS_DIR ${SOURCES_DIR}/${PLATFORM_OS_DIR} PARENT_SCOPE)
     set(INCLUDE_GRAPHICS_DIR ${INCLUDE_DIR}/${GRAPHICS_DIR} PARENT_SCOPE)
     set(SOURCES_GRAPHICS_DIR ${SOURCES_DIR}/${GRAPHICS_DIR} PARENT_SCOPE)
+    set(INSTALL_INCLUDE_DIR "include/${NAMESPACE}" PARENT_SCOPE)
     set(INCLUDE_DIR ${INCLUDE_DIR} PARENT_SCOPE)
     set(SOURCES_DIR ${SOURCES_DIR} PARENT_SCOPE)
     set(NAMESPACE_DIR ${NAMESPACE} PARENT_SCOPE)
diff --git a/Modules/Common/Instrumentation/CMakeLists.txt b/Modules/Common/Instrumentation/CMakeLists.txt
@@ -94,9 +94,9 @@ set_target_properties(${TARGET}
 
 install(TARGETS ${TARGET}
     PUBLIC_HEADER
-        DESTINATION ${INCLUDE_DIR}
+        DESTINATION ${INSTALL_INCLUDE_DIR}
         COMPONENT Development
     ARCHIVE
-        DESTINATION Lib
+        DESTINATION lib
         COMPONENT Development
 )
diff --git a/Modules/Common/Primitives/CMakeLists.txt b/Modules/Common/Primitives/CMakeLists.txt
@@ -46,9 +46,9 @@ set_target_properties(${TARGET}
 
 install(TARGETS ${TARGET}
     PUBLIC_HEADER
-        DESTINATION ${INCLUDE_DIR}
+        DESTINATION ${INSTALL_INCLUDE_DIR}
         COMPONENT Development
     ARCHIVE
-        DESTINATION Lib
+        DESTINATION lib
         COMPONENT Development
 )
diff --git a/Modules/Data/Animation/CMakeLists.txt b/Modules/Data/Animation/CMakeLists.txt
@@ -51,9 +51,9 @@ set_target_properties(${TARGET}
 
 install(TARGETS ${TARGET}
     PUBLIC_HEADER
-        DESTINATION ${INCLUDE_DIR}
+        DESTINATION ${INSTALL_INCLUDE_DIR}
         COMPONENT Development
     ARCHIVE
-        DESTINATION Lib
+        DESTINATION lib
         COMPONENT Development
 )
diff --git a/Modules/Data/Events/CMakeLists.txt b/Modules/Data/Events/CMakeLists.txt
@@ -44,6 +44,6 @@ source_group(TREE ${CMAKE_CURRENT_SOURCE_DIR} FILES ${SOURCES})
 
 install(TARGETS ${TARGET}
     PUBLIC_HEADER
-        DESTINATION ${INCLUDE_DIR}
+        DESTINATION ${INSTALL_INCLUDE_DIR}
         COMPONENT Development
 )
diff --git a/Modules/Data/Primitives/CMakeLists.txt b/Modules/Data/Primitives/CMakeLists.txt
@@ -56,9 +56,9 @@ set_target_properties(${TARGET}
 
 install(TARGETS ${TARGET}
     PUBLIC_HEADER
-        DESTINATION ${INCLUDE_DIR}
+        DESTINATION ${INSTALL_INCLUDE_DIR}
         COMPONENT Development
     ARCHIVE
-        DESTINATION Lib
+        DESTINATION lib
         COMPONENT Development
 )
diff --git a/Modules/Data/Provider/CMakeLists.txt b/Modules/Data/Provider/CMakeLists.txt
@@ -49,9 +49,9 @@ set_target_properties(${TARGET}
 
 install(TARGETS ${TARGET}
     PUBLIC_HEADER
-        DESTINATION ${INCLUDE_DIR}
+        DESTINATION ${INSTALL_INCLUDE_DIR}
         COMPONENT Development
     ARCHIVE
-        DESTINATION Lib
+        DESTINATION lib
         COMPONENT Development
 )
diff --git a/Modules/Data/Types/CMakeLists.txt b/Modules/Data/Types/CMakeLists.txt
@@ -52,9 +52,9 @@ set_target_properties(${TARGET}
 
 install(TARGETS ${TARGET}
     PUBLIC_HEADER
-        DESTINATION ${INCLUDE_DIR}
+        DESTINATION ${INSTALL_INCLUDE_DIR}
         COMPONENT Development
     ARCHIVE
-        DESTINATION Lib
+        DESTINATION lib
         COMPONENT Development
 )
diff --git a/Modules/Graphics/App/CMakeLists.txt b/Modules/Graphics/App/CMakeLists.txt
@@ -61,9 +61,9 @@ source_group(TREE ${CMAKE_CURRENT_SOURCE_DIR} FILES ${HEADERS} ${SOURCES})
 
 install(TARGETS ${TARGET}
     PUBLIC_HEADER
-        DESTINATION ${INCLUDE_DIR}
+        DESTINATION ${INSTALL_INCLUDE_DIR}
         COMPONENT Development
     ARCHIVE
-        DESTINATION Lib
+        DESTINATION lib
         COMPONENT Development
 )
diff --git a/Modules/Graphics/Camera/CMakeLists.txt b/Modules/Graphics/Camera/CMakeLists.txt
@@ -52,9 +52,9 @@ set_target_properties(${TARGET}
 
 install(TARGETS ${TARGET}
     PUBLIC_HEADER
-        DESTINATION ${INCLUDE_DIR}
+        DESTINATION ${INSTALL_INCLUDE_DIR}
         COMPONENT Development
     ARCHIVE
-        DESTINATION Lib
+        DESTINATION lib
         COMPONENT Development
 )
diff --git a/Modules/Graphics/Mesh/CMakeLists.txt b/Modules/Graphics/Mesh/CMakeLists.txt
@@ -54,9 +54,9 @@ set_target_properties(${TARGET}
 
 install(TARGETS ${TARGET}
     PUBLIC_HEADER
-        DESTINATION ${INCLUDE_DIR}
+        DESTINATION ${INSTALL_INCLUDE_DIR}
         COMPONENT Development
     ARCHIVE
-        DESTINATION Lib
+        DESTINATION lib
         COMPONENT Development
 )
diff --git a/Modules/Graphics/Primitives/CMakeLists.txt b/Modules/Graphics/Primitives/CMakeLists.txt
@@ -122,9 +122,9 @@ set_target_properties(${TARGET}
 
 install(TARGETS ${TARGET}
     PUBLIC_HEADER
-        DESTINATION ${INCLUDE_DIR}
+        DESTINATION ${INSTALL_INCLUDE_DIR}
         COMPONENT Development
     ARCHIVE
-        DESTINATION Lib
+        DESTINATION lib
         COMPONENT Development
 )
diff --git a/Modules/Graphics/RHI/Impl/CMakeLists.txt b/Modules/Graphics/RHI/Impl/CMakeLists.txt
@@ -177,10 +177,10 @@ set_target_properties(${TARGET}
 
 install(TARGETS ${TARGET}
     PUBLIC_HEADER
-        DESTINATION ${INCLUDE_DIR}
+        DESTINATION ${INSTALL_INCLUDE_DIR}
         COMPONENT Development
     ARCHIVE
-        DESTINATION Lib
+        DESTINATION lib
         COMPONENT Development
 )
 
diff --git a/Modules/Graphics/RHI/Interface/CMakeLists.txt b/Modules/Graphics/RHI/Interface/CMakeLists.txt
@@ -126,9 +126,9 @@ set_target_properties(${TARGET}
 
 install(TARGETS ${TARGET}
     PUBLIC_HEADER
-        DESTINATION ${INCLUDE_DIR}
+        DESTINATION ${INSTALL_INCLUDE_DIR}
         COMPONENT Development
     ARCHIVE
-        DESTINATION Lib
+        DESTINATION lib
         COMPONENT Development
 )
diff --git a/Modules/Graphics/Types/CMakeLists.txt b/Modules/Graphics/Types/CMakeLists.txt
@@ -54,10 +54,10 @@ set_target_properties(${TARGET}
 
 install(TARGETS ${TARGET}
     PUBLIC_HEADER
-        DESTINATION ${INCLUDE_DIR}
+        DESTINATION ${INSTALL_INCLUDE_DIR}
         COMPONENT Development
     ARCHIVE
-        DESTINATION Lib
+        DESTINATION lib
         COMPONENT Development
 )
 
diff --git a/Modules/Kit/CMakeLists.txt b/Modules/Kit/CMakeLists.txt
@@ -65,12 +65,12 @@ set_target_properties(${TARGET}
 
 install(TARGETS ${TARGET}
     INCLUDES
-        DESTINATION ${INCLUDE_DIR}
+        DESTINATION ${INSTALL_INCLUDE_DIR}
         COMPONENT Development
     PUBLIC_HEADER
-        DESTINATION ${INCLUDE_DIR}
+        DESTINATION ${INSTALL_INCLUDE_DIR}
         COMPONENT Development
     ARCHIVE
-        DESTINATION Lib
+        DESTINATION lib
         COMPONENT Development
 )
diff --git a/Modules/Platform/App/CMakeLists.txt b/Modules/Platform/App/CMakeLists.txt
@@ -142,10 +142,10 @@ endif()
 
 install(TARGETS ${TARGET}
     PUBLIC_HEADER
-        DESTINATION ${INCLUDE_DIR}
+        DESTINATION ${INSTALL_INCLUDE_DIR}
         COMPONENT Development
     ARCHIVE
-        DESTINATION Lib
+        DESTINATION lib
         COMPONENT Development
 )
 
diff --git a/Modules/Platform/AppView/CMakeLists.txt b/Modules/Platform/AppView/CMakeLists.txt
@@ -98,10 +98,10 @@ endif()
 
 install(TARGETS ${TARGET}
     PUBLIC_HEADER
-        DESTINATION ${INCLUDE_DIR}
+        DESTINATION ${INSTALL_INCLUDE_DIR}
         COMPONENT Development
     ARCHIVE
-        DESTINATION Lib
+        DESTINATION lib
         COMPONENT Development
 )
 
diff --git a/Modules/Platform/Input/ActionControllers/CMakeLists.txt b/Modules/Platform/Input/ActionControllers/CMakeLists.txt
@@ -39,6 +39,6 @@ set_target_properties(${TARGET}
 
 install(TARGETS ${TARGET}
     PUBLIC_HEADER
-        DESTINATION ${INCLUDE_DIR}
+        DESTINATION ${INSTALL_INCLUDE_DIR}
         COMPONENT Development
 )
diff --git a/Modules/Platform/Input/Controllers/CMakeLists.txt b/Modules/Platform/Input/Controllers/CMakeLists.txt
@@ -54,9 +54,9 @@ set_target_properties(${TARGET}
 
 install(TARGETS ${TARGET}
     PUBLIC_HEADER
-        DESTINATION ${INCLUDE_DIR}
+        DESTINATION ${INSTALL_INCLUDE_DIR}
         COMPONENT Development
     ARCHIVE
-        DESTINATION Lib
+        DESTINATION lib
         COMPONENT Development
 )
diff --git a/Modules/Platform/Input/Keyboard/CMakeLists.txt b/Modules/Platform/Input/Keyboard/CMakeLists.txt
@@ -67,9 +67,9 @@ endif()
 
 install(TARGETS ${TARGET}
     PUBLIC_HEADER
-        DESTINATION ${INCLUDE_DIR}
+        DESTINATION ${INSTALL_INCLUDE_DIR}
         COMPONENT Development
     ARCHIVE
-        DESTINATION Lib
+        DESTINATION lib
         COMPONENT Development
 )
diff --git a/Modules/Platform/Input/Mouse/CMakeLists.txt b/Modules/Platform/Input/Mouse/CMakeLists.txt
@@ -42,9 +42,9 @@ set_target_properties(${TARGET}
 
 install(TARGETS ${TARGET}
     PUBLIC_HEADER
-        DESTINATION ${INCLUDE_DIR}
+        DESTINATION ${INSTALL_INCLUDE_DIR}
         COMPONENT Development
     ARCHIVE
-        DESTINATION Lib
+        DESTINATION lib
         COMPONENT Development
 )
diff --git a/Modules/Platform/Utils/CMakeLists.txt b/Modules/Platform/Utils/CMakeLists.txt
@@ -88,10 +88,10 @@ endif()
 
 install(TARGETS ${TARGET}
     PUBLIC_HEADER
-        DESTINATION ${INCLUDE_DIR}
+        DESTINATION ${INSTALL_INCLUDE_DIR}
         COMPONENT Development
     ARCHIVE
-        DESTINATION Lib
+        DESTINATION lib
         COMPONENT Development
 )
 
diff --git a/Modules/UserInterface/App/CMakeLists.txt b/Modules/UserInterface/App/CMakeLists.txt
@@ -68,10 +68,10 @@ source_group(TREE ${CMAKE_CURRENT_SOURCE_DIR} FILES ${HEADERS} ${SOURCES})
 
 install(TARGETS ${TARGET}
     PUBLIC_HEADER
-        DESTINATION ${INCLUDE_DIR}
+        DESTINATION ${INSTALL_INCLUDE_DIR}
         COMPONENT Development
     ARCHIVE
-        DESTINATION Lib
+        DESTINATION lib
         COMPONENT Development
 )
 
diff --git a/Modules/UserInterface/Types/CMakeLists.txt b/Modules/UserInterface/Types/CMakeLists.txt
@@ -54,10 +54,10 @@ set_target_properties(${TARGET}
 
 install(TARGETS ${TARGET}
     PUBLIC_HEADER
-        DESTINATION ${INCLUDE_DIR}
+        DESTINATION ${INSTALL_INCLUDE_DIR}
         COMPONENT Development
     ARCHIVE
-        DESTINATION Lib
+        DESTINATION lib
         COMPONENT Development
 )
 
diff --git a/Modules/UserInterface/Typography/CMakeLists.txt b/Modules/UserInterface/Typography/CMakeLists.txt
@@ -78,10 +78,10 @@ set_target_properties(${TARGET}
 
 install(TARGETS ${TARGET}
     PUBLIC_HEADER
-        DESTINATION ${INCLUDE_DIR}
+        DESTINATION ${INSTALL_INCLUDE_DIR}
         COMPONENT Development
     ARCHIVE
-        DESTINATION Lib
+        DESTINATION lib
         COMPONENT Development
 )
 
diff --git a/Modules/UserInterface/Widgets/CMakeLists.txt b/Modules/UserInterface/Widgets/CMakeLists.txt
@@ -58,10 +58,10 @@ set_target_properties(${TARGET}
 
 install(TARGETS ${TARGET}
     PUBLIC_HEADER
-        DESTINATION ${INCLUDE_DIR}
+        DESTINATION ${INSTALL_INCLUDE_DIR}
         COMPONENT Development
     ARCHIVE
-        DESTINATION Lib
+        DESTINATION lib
         COMPONENT Development
 )
 

Original file line number	Diff line number	Diff line change
`@@ -44,6 +44,6 @@ source_group(TREE ${CMAKE_CURRENT_SOURCE_DIR} FILES ${SOURCES})`
`44`	`44`
`45`	`45`	`install(TARGETS ${TARGET}`
`46`	`46`	`PUBLIC_HEADER`
`47`		`- DESTINATION ${INCLUDE_DIR}`
	`47`	`+ DESTINATION ${INSTALL_INCLUDE_DIR}`
`48`	`48`	`COMPONENT Development`
`49`	`49`	`)`