Skip to content

Commit b622a84

Browse files
committed
build(cmake): fix install include path
1 parent c3b9f7a commit b622a84

File tree

2 files changed

+3
-8
lines changed

2 files changed

+3
-8
lines changed

CMakeLists.txt

Lines changed: 1 addition & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -41,16 +41,11 @@ target_install(
4141
NAMESPACE ${PROJECT_NAME}
4242
BINARY_DIR ${CMAKE_CURRENT_BINARY_DIR}
4343
INCLUDE_DIR ${CMAKE_CURRENT_SOURCE_DIR}/include
44-
INCLUDE_DESTINATION ${CMAKE_INSTALL_INCLUDEDIR}
44+
INCLUDE_DESTINATION ${CMAKE_INSTALL_INCLUDEDIR}/${PROJECT_NAME}/${PROJECT_VERSION}
4545
COMPATIBILITY SameMajorVersion
4646
DEPENDENCIES fmt;ctre;range-v3
4747
)
4848

49-
install(
50-
DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR}/cmake
51-
DESTINATION ${CMAKE_INSTALL_LIBDIR}
52-
)
53-
5449
get_directory_property(is_subproject PARENT_DIRECTORY)
5550

5651
if(NOT is_subproject)

cmake/Utils.cmake

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -73,7 +73,7 @@ function(config_interface_lib lib_name)
7373
target_include_directories(
7474
${lib_name}
7575
INTERFACE
76-
$<INSTALL_INTERFACE:include>
76+
$<INSTALL_INTERFACE:include/${PROJECT_NAME}/${PROJECT_VERSION}>
7777
$<BUILD_INTERFACE:${CMAKE_CURRENT_SOURCE_DIR}/include>
7878
)
7979
endfunction()
@@ -116,7 +116,7 @@ function(config_lib lib_name includes src lib_type)
116116
target_include_directories(
117117
${lib_name}
118118
PUBLIC
119-
$<INSTALL_INTERFACE:include>
119+
$<INSTALL_INTERFACE:include/${PROJECT_NAME}/${PROJECT_VERSION}>
120120
$<BUILD_INTERFACE:${CMAKE_CURRENT_SOURCE_DIR}/include>
121121
)
122122
endfunction()

0 commit comments

Comments
 (0)