Merge pull request #899 from Jan200101/PR/header-merge

Install header files into one folder
wolfpld · Oct 2, 2024 · 4497201 · 4497201
2 parents e0c3efe + f45dc88
commit 4497201
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 4 deletions.
diff --git a/CMakeLists.txt b/CMakeLists.txt
@@ -178,9 +178,9 @@ export(TARGETS TracyClient
 install(FILES ${tracy_includes}
         DESTINATION ${CMAKE_INSTALL_INCLUDEDIR}/tracy)
 install(FILES ${client_includes}
-        DESTINATION ${CMAKE_INSTALL_INCLUDEDIR}/client)
+        DESTINATION ${CMAKE_INSTALL_INCLUDEDIR}/tracy/client)
 install(FILES ${common_includes}
-        DESTINATION ${CMAKE_INSTALL_INCLUDEDIR}/common)
+        DESTINATION ${CMAKE_INSTALL_INCLUDEDIR}/tracy/common)
 install(EXPORT TracyConfig
         NAMESPACE Tracy::
         FILE TracyTargets.cmake

diff --git a/meson.build b/meson.build
@@ -205,8 +205,8 @@ tracy = library('tracy', tracy_src, tracy_header_files,
     install             : true)
 
 install_headers(includes, subdir : 'tracy')
-install_headers(common_includes, subdir : 'common')
-install_headers(client_includes, subdir : 'client')
+install_headers(common_includes, subdir : 'tracy/common')
+install_headers(client_includes, subdir : 'tracy/client')
 
 tracy_dep_compile_args = tracy_common_args