Add support for both cmake_layout and non cmake_layout when generating toolchain file

Author: ViliusSutkus89

UpcomingReleaseNotes.md

@@ -0,0 +1 @@
+Add support for both cmake_layout and non cmake_layout when generating toolchain file.

src/main/kotlin/app/opendocument/ConanAndroidGradlePlugin.kt

@@ -47,6 +47,7 @@ class ConanAndroidGradlePlugin: Plugin<Project> {
             }
             preBuild.dependsOn(conanInstallTask)
             syncTask?.dependsOn(conanInstallTask)
+            generateToolchainFileTask.get().dependsOn(conanInstallTask)
         }
     }
 }

src/main/kotlin/app/opendocument/ConanInstallTask.kt

@@ -21,11 +21,13 @@
 package app.opendocument
 
 import org.gradle.api.file.Directory
+import org.gradle.api.file.RegularFile
 import org.gradle.api.provider.Property
 import org.gradle.api.provider.Provider
 import org.gradle.api.tasks.Exec
 import org.gradle.api.tasks.Input
 import org.gradle.api.tasks.OutputDirectory
+import org.gradle.api.tasks.OutputFile
 
 
 abstract class ConanInstallTask : Exec() {
@@ -46,6 +48,9 @@ abstract class ConanInstallTask : Exec() {
     @get:OutputDirectory
     val outputDirectory: Provider<Directory> = arch.map { project.layout.buildDirectory.get().dir("conan/$it") }
 
+    @get:OutputFile
+    val conanToolchainFile: Provider<RegularFile> = arch.map { project.layout.buildDirectory.get().file("conan/$it/conan_toolchain.cmake") }
+
     override fun exec() {
         commandLine(
             "conan",
@@ -56,5 +61,16 @@ abstract class ConanInstallTask : Exec() {
             "--settings:host", "arch=" + arch.get(),
         )
         super.exec()
+
+        // conan install creates toolchain in one of two places:
+        // 1: conan/armv8/conan_toolchain.cmake
+        // 2: conan/armv8/build/${CMAKE_BUILD_TYPE}/generators/conan_toolchain.cmake
+        conanToolchainFile.get().asFile.let { toolchainFile ->
+            if (!toolchainFile.exists()) {
+                val CMAKE_CURRENT_LIST_DIR = "\${CMAKE_CURRENT_LIST_DIR}"
+                val CMAKE_BUILD_TYPE = "\${CMAKE_BUILD_TYPE}"
+                toolchainFile.writeText("include(\"${CMAKE_CURRENT_LIST_DIR}/build/${CMAKE_BUILD_TYPE}/generators/conan_toolchain.cmake\")\n")
+            }
+        }
     }
 }

src/main/kotlin/app/opendocument/GenerateConanToolchainFileTask.kt

@@ -37,7 +37,6 @@ abstract class GenerateConanToolchainFileTask : DefaultTask() {
     fun writeToolchain() {
         val ANDROID_ABI = "\${ANDROID_ABI}"
         val CMAKE_CURRENT_LIST_DIR = "\${CMAKE_CURRENT_LIST_DIR}"
-        val CMAKE_BUILD_TYPE = "\${CMAKE_BUILD_TYPE}"
         conanToolchainFile.get().asFile.writeText("""
 # During multiple stages of CMake configuration, the toolchain file is processed and command-line
 # variables may not be always available. The script exits prematurely if essential variables are absent.
@@ -46,13 +45,13 @@ if ( NOT ANDROID_ABI OR NOT CMAKE_BUILD_TYPE )
   return()
 endif()
 if(${ANDROID_ABI} STREQUAL "x86_64")
-  include("${CMAKE_CURRENT_LIST_DIR}/x86_64/build/${CMAKE_BUILD_TYPE}/generators/conan_toolchain.cmake")
+  include("${CMAKE_CURRENT_LIST_DIR}/x86_64/conan_toolchain.cmake")
 elseif(${ANDROID_ABI} STREQUAL "x86")
-  include("${CMAKE_CURRENT_LIST_DIR}/x86/build/${CMAKE_BUILD_TYPE}/generators/conan_toolchain.cmake")
+  include("${CMAKE_CURRENT_LIST_DIR}/x86/conan_toolchain.cmake")
 elseif(${ANDROID_ABI} STREQUAL "arm64-v8a")
-  include("${CMAKE_CURRENT_LIST_DIR}/armv8/build/${CMAKE_BUILD_TYPE}/generators/conan_toolchain.cmake")
+  include("${CMAKE_CURRENT_LIST_DIR}/armv8/conan_toolchain.cmake")
 elseif(${ANDROID_ABI} STREQUAL "armeabi-v7a")
-  include("${CMAKE_CURRENT_LIST_DIR}/armv7/build/${CMAKE_BUILD_TYPE}/generators/conan_toolchain.cmake")
+  include("${CMAKE_CURRENT_LIST_DIR}/armv7/conan_toolchain.cmake")
 else()
   message(FATAL "Not supported configuration")
 endif()