diff --git a/assets/test/cmake-compile-flags/CMakeLists.txt b/assets/test/cmake-compile-flags/CMakeLists.txt
new file mode 100644
index 000000000..a8b35d019
--- /dev/null
+++ b/assets/test/cmake-compile-flags/CMakeLists.txt
@@ -0,0 +1,5 @@
+cmake_minimum_required(VERSION 2.4)
+
+project(hello_world)
+
+add_executable(app main.cpp)
\ No newline at end of file
diff --git a/assets/test/cmake-compile-flags/compile_flags.txt b/assets/test/cmake-compile-flags/compile_flags.txt
new file mode 100644
index 000000000..af1c2d2a9
--- /dev/null
+++ b/assets/test/cmake-compile-flags/compile_flags.txt
@@ -0,0 +1,8 @@
+/Applications/Xcode.app/Contents/Developer/Toolchains/XcodeDefault.xctoolchain/usr/bin/c++
+-isysroot
+/Applications/Xcode.app/Contents/Developer/Platforms/MacOSX.platform/Developer/SDKs/MacOSX13.1.sdk
+-mmacosx-version-min=13.0
+-o
+CMakeFiles/app.dir/main.o
+-c
+main.cpp
\ No newline at end of file
diff --git a/assets/test/cmake-compile-flags/main.cpp b/assets/test/cmake-compile-flags/main.cpp
new file mode 100644
index 000000000..e52a3fb1e
--- /dev/null
+++ b/assets/test/cmake-compile-flags/main.cpp
@@ -0,0 +1,7 @@
+#include <iostream>
+
+int main()
+{
+    std::cout << "Hello World!\n";
+    return 0;
+}
\ No newline at end of file
diff --git a/assets/test/dependencies/Packages/swift-markdown b/assets/test/dependencies/Packages/swift-markdown
new file mode 120000
index 000000000..c2cf3786f
--- /dev/null
+++ b/assets/test/dependencies/Packages/swift-markdown
@@ -0,0 +1 @@
+/Users/plemarquand/work/vscode-swift/assets/test/Swift-Markdown
\ No newline at end of file
diff --git a/package.json b/package.json
index 42540fa80..2a9488936 100644
--- a/package.json
+++ b/package.json
@@ -26,6 +26,8 @@
     "onLanguage:swift",
     "workspaceContains:Package.swift",
     "workspaceContains:compile_commands.json",
+    "workspaceContains:compile_flags.txt",
+    "workspaceContains:buildServer.json",
     "onDebugResolve:swift-lldb"
   ],
   "main": "./dist/src/extension.js",
@@ -1335,4 +1337,4 @@
     "vscode-languageclient": "^9.0.1",
     "xml2js": "^0.6.2"
   }
-}
+}
\ No newline at end of file
diff --git a/src/WorkspaceContext.ts b/src/WorkspaceContext.ts
index fdc26f697..cba4a7c47 100644
--- a/src/WorkspaceContext.ts
+++ b/src/WorkspaceContext.ts
@@ -349,7 +349,7 @@ export class WorkspaceContext implements vscode.Disposable {
     }
 
     async searchForPackages(folder: vscode.Uri, workspaceFolder: vscode.WorkspaceFolder) {
-        // add folder if Package.swift/compile_commands.json exists
+        // add folder if Package.swift/compile_commands.json/compile_flags.txt/buildServer.json exists
         if (await this.isValidWorkspaceFolder(folder.fsPath)) {
             await this.addPackageFolder(folder, workspaceFolder);
             return;
@@ -614,13 +614,15 @@ export class WorkspaceContext implements vscode.Disposable {
 
     /**
      * Return if folder is considered a valid root folder ie does it contain a SwiftPM
-     * Package.swift or a CMake compile_commands.json
+     * Package.swift or a CMake compile_commands.json, compile_flags.txt, or a BSP buildServer.json.
      */
     async isValidWorkspaceFolder(folder: string): Promise<boolean> {
         return (
             ((await pathExists(folder, "Package.swift")) &&
                 !configuration.disableSwiftPMIntegration) ||
-            (await pathExists(folder, "compile_commands.json"))
+            (await pathExists(folder, "compile_commands.json")) ||
+            (await pathExists(folder, "compile_flags.txt")) ||
+            (await pathExists(folder, "buildServer.json"))
         );
     }
 
diff --git a/test/integration-tests/ExtensionActivation.test.ts b/test/integration-tests/ExtensionActivation.test.ts
index a06daab7b..83148204c 100644
--- a/test/integration-tests/ExtensionActivation.test.ts
+++ b/test/integration-tests/ExtensionActivation.test.ts
@@ -22,6 +22,8 @@ import {
     deactivateExtension,
 } from "./utilities/testutilities";
 import { WorkspaceContext } from "../../src/WorkspaceContext";
+import { testAssetUri } from "../fixtures";
+import { assertContains } from "./testexplorer/utilities";
 
 suite("Extension Activation/Deactivation Tests", () => {
     suite("Extension Activation", () => {
@@ -97,4 +99,29 @@ suite("Extension Activation/Deactivation Tests", () => {
             assert.notStrictEqual(workspaceContext, capturedWorkspaceContext);
         });
     });
+
+    suite("Activates for cmake projects", () => {
+        let workspaceContext: WorkspaceContext;
+
+        activateExtensionForTest({
+            async setup(ctx) {
+                workspaceContext = ctx;
+            },
+            testAssets: ["cmake", "cmake-compile-flags"],
+        });
+
+        test("compile_commands.json", async () => {
+            const lspWorkspaces = workspaceContext.languageClientManager.subFolderWorkspaces.map(
+                ({ fsPath }) => fsPath
+            );
+            assertContains(lspWorkspaces, testAssetUri("cmake").fsPath);
+        });
+
+        test("compile_flags.txt", async () => {
+            const lspWorkspaces = workspaceContext.languageClientManager.subFolderWorkspaces.map(
+                ({ fsPath }) => fsPath
+            );
+            assertContains(lspWorkspaces, testAssetUri("cmake-compile-flags").fsPath);
+        });
+    });
 });