fix

opendocument-app · Jan 19, 2025 · 7c1af11 · 7c1af11
1 parent d927a2b
commit 7c1af11
Showing 1 changed file with 11 additions and 7 deletions.
diff --git a/src/main/kotlin/app/opendocument/ConanInstallTask.kt b/src/main/kotlin/app/opendocument/ConanInstallTask.kt
@@ -68,17 +68,21 @@ abstract class ConanInstallTask : Exec() {
     val conanToolchainFile: Provider<RegularFile> = arch.map { project.layout.buildDirectory.get().file("conan/$it/conan_toolchain.cmake") }
 
     override fun exec() {
-        commandLine(
+        val args = mutableListOf(
             conanExecutable.get(),
             "install", conanfile.get(),
-            "--output-folder=" + outputDirectory.get(),
+            "--output-folder=${outputDirectory.get()}",
             "--build=missing",
-            "--profile:host=" + profile.get(),
-            "--profile:build=" + buildProfile.get(),
-            "--settings:host", "arch=" + arch.get(),
-            deployer.get()?.let { "--deployer=$it" },
-            deployerFolder.get()?.let { "--deployer-folder=$it" },
+            "--profile:host=${profile.get()}",
+            "--profile:build=${buildProfile.get()}",
+            "--settings:host", "arch=${arch.get()}"
         )
+
+        deployer.getOrNull()?.let { args.add("--deployer=$it") }
+        deployerFolder.getOrNull()?.let { args.add("--deployer-folder=$it") }
+
+        commandLine(args)
+
         super.exec()
 
         // conan install creates toolchain in one of two places: