Merge pull request #1125 from otegami/fix-ignored-includedir

Fix header file installation to respect `CMAKE_INSTALL_INCLUDEDIR`
msgpack · Jun 24, 2024 · bf2504e · bf2504e
2 parents a5c8a2c + 724d1aa
commit bf2504e
Showing 1 changed file with 6 additions and 4 deletions.
diff --git a/CMakeLists.txt b/CMakeLists.txt
@@ -271,12 +271,14 @@ INSTALL (TARGETS ${MSGPACK_INSTALLTARGETS} EXPORT msgpack-c-targets
     ARCHIVE DESTINATION ${CMAKE_INSTALL_LIBDIR}
 )
 FOREACH (file ${msgpack-c_common_HEADERS})
-    GET_FILENAME_COMPONENT (dir ${file} PATH)
-    INSTALL (FILES ${file} DESTINATION ${dir})
+    GET_FILENAME_COMPONENT(dir ${file} DIRECTORY)
+    STRING(REPLACE "include" "${CMAKE_INSTALL_INCLUDEDIR}" header_path ${dir})
+    INSTALL (FILES ${file} DESTINATION ${header_path})
 ENDFOREACH ()
 FOREACH (file ${msgpack-c_configured_HEADERS})
-    GET_FILENAME_COMPONENT (dir ${file} PATH)
-    INSTALL (FILES ${CMAKE_CURRENT_BINARY_DIR}/${file} DESTINATION ${dir})
+    GET_FILENAME_COMPONENT(dir ${file} DIRECTORY)
+    STRING(REPLACE "include" "${CMAKE_INSTALL_INCLUDEDIR}" header_path ${dir})
+    INSTALL (FILES ${CMAKE_CURRENT_BINARY_DIR}/${file} DESTINATION ${header_path})
 ENDFOREACH ()
 IF (NOT MSVC)
     INSTALL (FILES ${CMAKE_CURRENT_BINARY_DIR}/msgpack-c.pc DESTINATION ${CMAKE_INSTALL_LIBDIR}/pkgconfig)