diff options
| -rw-r--r-- | CMakeLists.txt | 23 | ||||
| -rw-r--r-- | CMakePresets.json | 19 |
2 files changed, 20 insertions, 22 deletions
diff --git a/CMakeLists.txt b/CMakeLists.txt index 9e50ae7c1..5e9530adb 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -552,15 +552,6 @@ if(SLANG_ENABLE_GFX) endif() # -# Installing any documentation -# - -file(GLOB_RECURSE docs CONFIGURE_DEPENDS docs/*.md) -if(docs) - install(FILES ${docs} DESTINATION ${CMAKE_INSTALL_DOCDIR}) -endif() - -# # The test executables and runtime-loaded modules # if(SLANG_ENABLE_TESTS AND SLANG_ENABLE_GFX AND SLANG_ENABLE_SLANGD AND SLANG_ENABLE_SLANGRT) @@ -796,4 +787,18 @@ endif() # # Packaging # +set(CPACK_ARCHIVE_COMPONENT_INSTALL ON) +set(CPACK_COMPONENTS_ALL_IN_ONE_PACKAGE ON) +install(FILES + "${slang_SOURCE_DIR}/README.md" + "${slang_SOURCE_DIR}/LICENSE" + DESTINATION . + COMPONENT metadata + EXCLUDE_FROM_ALL +) +install(DIRECTORY + "${slang_SOURCE_DIR}/docs/" + DESTINATION share/doc/slang +) + include(CPack) diff --git a/CMakePresets.json b/CMakePresets.json index de1959c28..27fe83109 100644 --- a/CMakePresets.json +++ b/CMakePresets.json @@ -35,16 +35,8 @@ "generator": "Visual Studio 17 2022" }, { - "name": "single-component", - "inherits": "default", - "description": "configure to package a single component", - "cacheVariables": { - "CPACK_ARCHIVE_COMPONENT_INSTALL": "ON" - } - }, - { "name": "slang-llvm", - "inherits": "single-component", + "inherits": "default", "description": "Build slang-llvm from the system LLVM", "cacheVariables": { "SLANG_SLANG_LLVM_FLAVOR": "USE_SYSTEM_LLVM" @@ -65,7 +57,7 @@ { "name": "generators", "inherits": "release", - "configurePreset": "single-component", + "configurePreset": "default", "targets": [ "all-generators" ] @@ -88,7 +80,8 @@ "ZIP" ], "variables": { - "CPACK_PACKAGE_FILE_NAME": "slang" + "CPACK_PACKAGE_FILE_NAME": "slang", + "CPACK_COMPONENTS_ALL": "Unspecified;metadata" } }, { @@ -110,7 +103,7 @@ { "name": "generators", "inherits": "release", - "configurePreset": "single-component", + "configurePreset": "default", "variables": { "CPACK_COMPONENTS_ALL": "generators" } @@ -164,7 +157,7 @@ "steps": [ { "type": "configure", - "name": "single-component" + "name": "default" }, { "type": "build", |