Merge remote-tracking branch 'origin/master' into drop-premake

Author: expipiplus1

CMakeLists.txt

@@ -553,15 +553,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
 #
@@ -798,4 +789,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)

CMakePresets.json

@@ -34,17 +34,9 @@
       "description": "Visual Studio 2022 project",
       "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",