File tree Expand file tree Collapse file tree 1 file changed +7
-4
lines changed
src/main/kotlin/app/opendocument Expand file tree Collapse file tree 1 file changed +7
-4
lines changed Original file line number Diff line number Diff line change @@ -49,12 +49,16 @@ abstract class ConanInstallTask : Exec() {
4949 @get:Input
5050 abstract val deployer: Property <String ?>
5151
52+ @get:Input
53+ abstract val deployerFolder: Property <String ?>
54+
5255 init {
5356 profile.convention(" default" )
5457 buildProfile.convention(" default" )
5558 conanfile.convention(" ." )
5659 conanExecutable.convention(" conan" )
5760 deployer.convention(null as String? )
61+ deployerFolder.convention(null as String? )
5862 }
5963
6064 @get:OutputDirectory
@@ -63,9 +67,6 @@ abstract class ConanInstallTask : Exec() {
6367 @get:OutputFile
6468 val conanToolchainFile: Provider <RegularFile > = arch.map { project.layout.buildDirectory.get().file(" conan/$it /conan_toolchain.cmake" ) }
6569
66- @get:OutputDirectory
67- val deployerFolder: Property <Directory > = arch.map { project.layout.buildDirectory.get().dir(" conan/$it /assets" ) }
68-
6970 override fun exec () {
7071 val args = mutableListOf (
7172 conanExecutable.get(),
@@ -79,7 +80,9 @@ abstract class ConanInstallTask : Exec() {
7980
8081 if (deployer.isPresent()) {
8182 args.add(" --deployer=${deployer.get()} " )
82- args.add(" --deployer-folder=${deployerFolder.get()} " )
83+ if (deployerFolder.isPresent()) {
84+ args.add(" --deployer-folder=${deployerFolder.get()} " )
85+ }
8386 }
8487
8588 commandLine(args)
You can’t perform that action at this time.
0 commit comments