From 66c6e4e16f2599717bdcd11295969e1c6de9be34 Mon Sep 17 00:00:00 2001 From: Alexander Shabalin Date: Mon, 20 Jun 2022 10:31:40 +0000 Subject: [PATCH] [K/N] Fix compdb usage for CLion Merge-request: KT-MR-6483 Merged-by: Alexander Shabalin --- .../jetbrains/kotlin/cpp/GenerateCompilationDatabase.kt | 7 ++++++- kotlin-native/build.gradle | 5 +++++ 2 files changed, 11 insertions(+), 1 deletion(-) diff --git a/kotlin-native/build-tools/src/main/kotlin/org/jetbrains/kotlin/cpp/GenerateCompilationDatabase.kt b/kotlin-native/build-tools/src/main/kotlin/org/jetbrains/kotlin/cpp/GenerateCompilationDatabase.kt index 20409544da6..372285f11a7 100644 --- a/kotlin-native/build-tools/src/main/kotlin/org/jetbrains/kotlin/cpp/GenerateCompilationDatabase.kt +++ b/kotlin-native/build-tools/src/main/kotlin/org/jetbrains/kotlin/cpp/GenerateCompilationDatabase.kt @@ -129,7 +129,12 @@ abstract class GenerateCompilationDatabase : DefaultTask() { serialized.addAll(gson.fromJson(it, Array::class.java)) } } - serialized.addAll(entries.get().flatMap { SerializedEntry.fromEntry(it) }) + entries.get().forEach { + // TODO: Reconsider when we use source directory for this. + // Make sure directories actually exist. + it.directory.asFile.get().mkdirs() + serialized.addAll(SerializedEntry.fromEntry(it)) + } FileWriter(outputFile.asFile.get()).use { gson.toJson(serialized, it) } diff --git a/kotlin-native/build.gradle b/kotlin-native/build.gradle index f5c1c063aa8..b67dcbba570 100644 --- a/kotlin-native/build.gradle +++ b/kotlin-native/build.gradle @@ -748,6 +748,11 @@ compilationDatabase { allTargets { mergeFrom(provider { project("common") }) mergeFrom(provider { project("runtime") }) + + // TODO: Reconsider this + task.configure { + dependsOn(":kotlin-native:runtime:downloadGoogleTest") + } } }