Skip to content

Add top-level 'metacg' folder to header install path #7

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Draft
wants to merge 3 commits into
base: devel
Choose a base branch
from
Draft
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion .github/workflows/mcg-ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
7 changes: 4 additions & 3 deletions cmake/installRules.cmake
Original file line number Diff line number Diff line change
Expand Up @@ -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:
Expand Down Expand Up @@ -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
)

Expand All @@ -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
)

Expand Down
2 changes: 1 addition & 1 deletion graph/CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -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(
Expand Down