update ci

Neargye · Neargye · commit 003cb5ac4eae · 2026-07-04T21:45:21.000+04:00
diff --git a/.github/workflows/scorecard.yml b/.github/workflows/scorecard.yml
@@ -52,6 +52,6 @@ jobs:
           retention-days: 5
 
       - name: Upload to code scanning
-        uses: github/codeql-action/upload-sarif@8533807ff379ac610d2b2c389c47e7c629d31d13 # v4.36.3
+        uses: github/codeql-action/upload-sarif@v4.36.3
         with:
           sarif_file: results.sarif
diff --git a/cmake/GenPkgConfig/GenPkgConfig.cmake b/cmake/GenPkgConfig/GenPkgConfig.cmake
@@ -38,7 +38,7 @@ Functions
         INSTALL_LIB_DIR <path to something like CMAKE_INSTALL_LIBDIR>
         INSTALL_INCLUDE_DIR <path to something like CMAKE_INSTALL_INCLUDEDIR>
         REQUIRES ... <list of pkg-config packages this one depends on> ...
-        REQUIRES ... <list of pkg-config packages this one conflicts with> ...
+        CONFLICTS ... <list of pkg-config packages this one conflicts with> ...
     )
 
     The arguments are optional and usually are not needed to be set if global (not component-specific) CPACK vars have been set before.
diff --git a/cmake/GenPkgConfig/ReadMe.md b/cmake/GenPkgConfig/ReadMe.md
@@ -20,7 +20,7 @@ configure_pkg_config_file(<targetName>
 	INSTALL_LIB_DIR <path to something like CMAKE_INSTALL_LIBDIR>
 	INSTALL_INCLUDE_DIR <path to something like CMAKE_INSTALL_INCLUDEDIR>
 	REQUIRES ... <list of pkg-config packages this one depends on> ...
-	REQUIRES ... <list of pkg-config packages this one conflicts with> ...
+	CONFLICTS ... <list of pkg-config packages this one conflicts with> ...
 )
 ```
 
diff --git a/cmake/GenPkgConfig/buildTimeScripts/getObjectFilesBaseNames.cmake b/cmake/GenPkgConfig/buildTimeScripts/getObjectFilesBaseNames.cmake
@@ -1,4 +1,3 @@
-
 message(STATUS "objectsFile  ${objectsFile}")
 message(STATUS "pkgConfigFileFinal  ${pkgConfigFileFinal}")
 message(STATUS "pkgConfigFileUnlinished  ${pkgConfigFileUnlinished}")

Original file line number	Diff line number	Diff line change
`@@ -38,7 +38,7 @@ Functions`
`38`	`38`	`INSTALL_LIB_DIR <path to something like CMAKE_INSTALL_LIBDIR>`
`39`	`39`	`INSTALL_INCLUDE_DIR <path to something like CMAKE_INSTALL_INCLUDEDIR>`
`40`	`40`	`REQUIRES ... <list of pkg-config packages this one depends on> ...`
`41`		`- REQUIRES ... <list of pkg-config packages this one conflicts with> ...`
	`41`	`+ CONFLICTS ... <list of pkg-config packages this one conflicts with> ...`
`42`	`42`	`)`
`43`	`43`
`44`	`44`	`The arguments are optional and usually are not needed to be set if global (not component-specific) CPACK vars have been set before.`
Original file line number	Diff line number	Diff line change
`@@ -20,7 +20,7 @@ configure_pkg_config_file(<targetName>`
`20`	`20`	`INSTALL_LIB_DIR <path to something like CMAKE_INSTALL_LIBDIR>`
`21`	`21`	`INSTALL_INCLUDE_DIR <path to something like CMAKE_INSTALL_INCLUDEDIR>`
`22`	`22`	`REQUIRES ... <list of pkg-config packages this one depends on> ...`
`23`		`- REQUIRES ... <list of pkg-config packages this one conflicts with> ...`
	`23`	`+ CONFLICTS ... <list of pkg-config packages this one conflicts with> ...`
`24`	`24`	`)`
`25`	`25`	```
`26`	`26`
Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,3 @@`
`1`		`-`
`2`	`1`	`message(STATUS "objectsFile ${objectsFile}")`
`3`	`2`	`message(STATUS "pkgConfigFileFinal ${pkgConfigFileFinal}")`
`4`	`3`	`message(STATUS "pkgConfigFileUnlinished ${pkgConfigFileUnlinished}")`