[K/N] Fix compdb usage for CLion
Merge-request: KT-MR-6483 Merged-by: Alexander Shabalin <Alexander.Shabalin@jetbrains.com>
This commit is contained in:
committed by
Space
parent
29b6039f37
commit
66c6e4e16f
+6
-1
@@ -129,7 +129,12 @@ abstract class GenerateCompilationDatabase : DefaultTask() {
|
|||||||
serialized.addAll(gson.fromJson(it, Array<SerializedEntry>::class.java))
|
serialized.addAll(gson.fromJson(it, Array<SerializedEntry>::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 {
|
FileWriter(outputFile.asFile.get()).use {
|
||||||
gson.toJson(serialized, it)
|
gson.toJson(serialized, it)
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -748,6 +748,11 @@ compilationDatabase {
|
|||||||
allTargets {
|
allTargets {
|
||||||
mergeFrom(provider { project("common") })
|
mergeFrom(provider { project("common") })
|
||||||
mergeFrom(provider { project("runtime") })
|
mergeFrom(provider { project("runtime") })
|
||||||
|
|
||||||
|
// TODO: Reconsider this
|
||||||
|
task.configure {
|
||||||
|
dependsOn(":kotlin-native:runtime:downloadGoogleTest")
|
||||||
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|||||||
Reference in New Issue
Block a user