From c197e53e881df52f77a55e291a6cdeb62c192e8b Mon Sep 17 00:00:00 2001 From: Sebastian Kreutzer Date: Tue, 1 Apr 2025 12:39:05 +0200 Subject: [PATCH 1/3] Add top-level 'metacg' folder to header install path --- .github/workflows/mcg-ci.yml | 2 +- cmake/installRules.cmake | 9 +++++---- graph/CMakeLists.txt | 2 +- 3 files changed, 7 insertions(+), 6 deletions(-) diff --git a/.github/workflows/mcg-ci.yml b/.github/workflows/mcg-ci.yml index d4e318e2..51a4716d 100644 --- a/.github/workflows/mcg-ci.yml +++ b/.github/workflows/mcg-ci.yml @@ -21,7 +21,7 @@ jobs: run: | cmake --install build --prefix install stat install/lib/libmetacg.so - stat install/include/metadata/CustomMD.h + stat install/include/metacg/metadata/CustomMD.h build-container: runs-on: ubuntu-latest diff --git a/cmake/installRules.cmake b/cmake/installRules.cmake index 18810dd0..3ce8259a 100644 --- a/cmake/installRules.cmake +++ b/cmake/installRules.cmake @@ -14,10 +14,11 @@ set(package metacg) # We put the export file there. We currently don't really use the export file (and I'm unsure if we should) install( DIRECTORY include/ "${PROJECT_BINARY_DIR}/graph/export/" - DESTINATION "${CMAKE_INSTALL_INCLUDEDIR}" + DESTINATION "${CMAKE_INSTALL_INCLUDEDIR}/metacg" COMPONENT metacg_Development FILES_MATCHING PATTERN "*.h" + PATTERN "*.hpp" ) # Installation rule for the metacg library. Honestly, not sure what all this does. Following the example here: @@ -32,7 +33,7 @@ install( ARCHIVE # COMPONENT metacg_Development INCLUDES # - DESTINATION "${CMAKE_INSTALL_INCLUDEDIR}" + DESTINATION "${CMAKE_INSTALL_INCLUDEDIR}/metacg" ) # Call helper function to "generate" a metacgConfigVersion file @@ -67,7 +68,7 @@ install( # Install config.h install( FILES "${PROJECT_BINARY_DIR}/config.h" - DESTINATION "${CMAKE_INSTALL_INCLUDEDIR}" + DESTINATION "${CMAKE_INSTALL_INCLUDEDIR}/metacg" COMPONENT metacg_Development ) @@ -82,7 +83,7 @@ install( # Install the generated CustomMD.h header install( FILES ${PROJECT_BINARY_DIR}/graph/include/metadata/CustomMD.h - DESTINATION ${CMAKE_INSTALL_INCLUDEDIR}/metadata + DESTINATION ${CMAKE_INSTALL_INCLUDEDIR}/metacg/metadata COMPONENT metacg_Development ) diff --git a/graph/CMakeLists.txt b/graph/CMakeLists.txt index 098ebc03..48dc1023 100644 --- a/graph/CMakeLists.txt +++ b/graph/CMakeLists.txt @@ -86,7 +86,7 @@ generate_export_header( BASE_NAME metacg EXPORT_FILE_NAME - export/metacg/metacg_export.hpp + export/metacg_export.hpp ) set_target_properties( From 8cf96a793ddc7cf77941719d2c57e3e60d84d54b Mon Sep 17 00:00:00 2001 From: Sebastian Kreutzer Date: Tue, 1 Apr 2025 12:43:43 +0200 Subject: [PATCH 2/3] fixup! Add top-level 'metacg' folder to header install path --- cmake/installRules.cmake | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/cmake/installRules.cmake b/cmake/installRules.cmake index 3ce8259a..24e2eac8 100644 --- a/cmake/installRules.cmake +++ b/cmake/installRules.cmake @@ -18,7 +18,7 @@ install( COMPONENT metacg_Development FILES_MATCHING PATTERN "*.h" - PATTERN "*.hpp" + PATTERN "*.hpp" ) # Installation rule for the metacg library. Honestly, not sure what all this does. Following the example here: From 1ab81ab254c98fdc9bfeff437de0753a4df5df8d Mon Sep 17 00:00:00 2001 From: Sebastian Kreutzer Date: Tue, 1 Apr 2025 13:25:35 +0200 Subject: [PATCH 3/3] fixup! fixup! Add top-level 'metacg' folder to header install path --- cmake/installRules.cmake | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/cmake/installRules.cmake b/cmake/installRules.cmake index 24e2eac8..b8ff5af0 100644 --- a/cmake/installRules.cmake +++ b/cmake/installRules.cmake @@ -33,7 +33,7 @@ install( ARCHIVE # COMPONENT metacg_Development INCLUDES # - DESTINATION "${CMAKE_INSTALL_INCLUDEDIR}/metacg" + DESTINATION "${CMAKE_INSTALL_INCLUDEDIR}" ) # Call helper function to "generate" a metacgConfigVersion file