Merge pull request #29 from sshcrack/add-licenses

Install licenses for packaged software

Author: sshcrack

CMakeLists.txt

@@ -51,7 +51,7 @@ foreach(PLUGIN_NAME ${PLUGIN_DIRS})
     endif()
 endforeach()
 
-project(main VERSION 1.11.4)
+project(main VERSION 1.11.5)
 include(cmake/update_package_version.cmake)
 
 add_package_json_version_update(CONFIGURE_TIME PACKAGE_JSON_PATH "react-native/package.json" TARGET_NAME "update_package_version")
@@ -286,6 +286,20 @@ install(TARGETS ${PROJECT_NAME}
     DESTINATION ${INSTALL_DESTINATION}
 )
 
+# Install vcpkg package licenses
+# Find all copyright files during configure step
+file(GLOB_RECURSE COPYRIGHT_FILES
+    "${CMAKE_BINARY_DIR}/vcpkg_installed/${VCPKG_TARGET_TRIPLET}/share/*/copyright")
+
+# Only set up install rules for directories that actually contain copyright files
+foreach(COPYRIGHT_FILE ${COPYRIGHT_FILES})
+    get_filename_component(PACKAGE_DIR "${COPYRIGHT_FILE}" DIRECTORY)
+    get_filename_component(PACKAGE_NAME "${PACKAGE_DIR}" NAME)
+
+    install(FILES "${COPYRIGHT_FILE}"
+        DESTINATION "licenses/${PACKAGE_NAME}")
+endforeach()
+
 # Create plugins and fonts directories
 install(DIRECTORY DESTINATION "plugins")
 
@@ -315,6 +329,8 @@ else()
 
 endif()
 
+
+
 if(ENABLE_DESKTOP)
 
     # -------------------

CMakePresets.json

@@ -61,14 +61,10 @@
         {
             "name": "desktop-windows-debug",
             "binaryDir": "${sourceDir}/desktop_build_debug",
-            "architecture": "x64",
             "cacheVariables": {
                 "DESKTOP_DEBUG_CONSOLE": true
             },
-            "environment": {
-                "TRIPLET": "x64-windows"
-            },
-            "inherits": "desktop"
+            "inherits": "desktop-windows"
         }
     ],
     "buildPresets": [

cmake/update_package_version.cmake

@@ -28,7 +28,7 @@ function(update_package_json_version PACKAGE_JSON_PATH PROJECT_VERSION)
 
     # Check if the replacement was successful
     if("${UPDATED_CONTENT}" STREQUAL "${PACKAGE_JSON_CONTENT}")
-        message(WARNING "No version field found or version was already ${PROJECT_VERSION} in ${PACKAGE_JSON_PATH}")
+        message(STATUS "No version field found or version was already ${PROJECT_VERSION} in ${PACKAGE_JSON_PATH}")
     else()
         # Write the updated content back to the file
         file(WRITE "${PACKAGE_JSON_PATH}" "${UPDATED_CONTENT}")

react-native/app.json

@@ -2,7 +2,7 @@
   "expo": {
     "name": "led-matrix",
     "slug": "led-matrix",
-    "version": "1.11.4",
+    "version": "1.11.5",
     "orientation": "portrait",
     "icon": "./assets/images/icon.png",
     "scheme": "myapp",

react-native/package.json

@@ -1,7 +1,7 @@
 {
   "name": "led-matrix",
   "main": "index.js",
-  "version": "1.11.4",
+  "version": "1.11.5",
   "scripts": {
     "eas-build-pre-install": "npm i -g pnpm@10",
     "dev": "expo start -c",