Fix version parsing in CMakeLists files (#1596)

* Fix version parsing in CMakeLists files #1589 Signed-off-by: Daniel Asztalos <[email protected]> * Lint fixes Signed-off-by: asztalosdani <[email protected]> --------- Signed-off-by: Daniel Asztalos <[email protected]> Signed-off-by: asztalosdani <[email protected]>
CycloneDX · Jan 24, 2025 · ea63d5c · ea63d5c
1 parent e07b12f
commit ea63d5c
Show file tree

Hide file tree

Showing 4 changed files with 21 additions and 2 deletions.
diff --git a/lib/helpers/utils.js b/lib/helpers/utils.js
@@ -13188,7 +13188,9 @@ export function parseCmakeLikeFile(cmakeListFile, pkgType, options = {}) {
         let parentVersion = undefined;
         // In case of meson.build we can find the version number after the word version
         // thanks to our replaces and splits
-        const versionIndex = tmpB.findIndex((v) => v === "version");
+        const versionIndex = tmpB.findIndex(
+          (v) => v?.toLowerCase() === "version",
+        );
         if (versionIndex > -1 && tmpB.length > versionIndex) {
           parentVersion = tmpB[versionIndex + 1];
         }

diff --git a/lib/helpers/utils.test.js b/lib/helpers/utils.test.js
@@ -5734,6 +5734,18 @@ test("parseCmakeLikeFile tests", () => {
     type: "application",
     version: "",
   });
+  retMap = parseCmakeLikeFile(
+    "./test/data/cmakes/CMakeLists-version.txt",
+    "generic",
+  );
+  expect(retMap.parentComponent).toEqual({
+    "bom-ref": "pkg:generic/[email protected]",
+    group: "",
+    name: "MyProject",
+    purl: "pkg:generic/[email protected]",
+    type: "application",
+    version: "2.1.3",
+  });
   retMap = parseCmakeLikeFile(
     "./test/data/cmakes/CMakeLists-tpl.txt",
     "generic",

diff --git a/test/data/cmakes/CMakeLists-version.txt b/test/data/cmakes/CMakeLists-version.txt
@@ -0,0 +1,5 @@
+cmake_minimum_required(VERSION 3.15)
+
+project(MyProject VERSION 2.1.3)
+
+add_executable(myexample example.cpp)
diff --git a/types/lib/helpers/utils.d.ts.map b/types/lib/helpers/utils.d.ts.map