Skip to content

Fix Windows CMake path handling. #1162

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
euclid-skyline wants to merge 1 commit into
base: main
Choose a base branch
from
+18 −2
Open

Fix Windows CMake path handling. #1162

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
10 changes: 9 additions & 1 deletion ...ic/src/main/java/com/android/ndk/samples/buildlogic/AndroidApplicationConventionPlugin.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,7 @@ import com.android.build.api.dsl.ApplicationExtension
import org.gradle.api.Plugin
import org.gradle.api.Project
import org.gradle.kotlin.dsl.configure
import java.lang.System.getProperty

class AndroidApplicationConventionPlugin : Plugin<Project> {
override fun apply(target: Project) {
Expand All @@ -30,7 +31,14 @@ class AndroidApplicationConventionPlugin : Plugin<Project> {
externalNativeBuild {
cmake {
arguments.add("-DANDROID_SUPPORT_FLEXIBLE_PAGE_SIZES=ON")
arguments.add("-DCMAKE_MODULE_PATH=${rootDir.resolve("cmake")}")
// Determine if the OS is Windows
val isWindows = getProperty("os.name").lowercase().contains("win")
val cmakeModulePath = if (isWindows) {
rootDir.resolve("cmake").toString().replace('\\', '/')
} else {
rootDir.resolve("cmake").toString()
}
arguments.add("-DCMAKE_MODULE_PATH=$cmakeModulePath")
}
}

Expand Down
10 changes: 9 additions & 1 deletion ...-logic/src/main/java/com/android/ndk/samples/buildlogic/AndroidLibraryConventionPlugin.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,7 @@ import com.android.build.api.dsl.LibraryExtension
import org.gradle.api.Plugin
import org.gradle.api.Project
import org.gradle.kotlin.dsl.configure
import java.lang.System.getProperty

class AndroidLibraryConventionPlugin : Plugin<Project> {
override fun apply(target: Project) {
Expand Down Expand Up @@ -33,7 +34,14 @@ class AndroidLibraryConventionPlugin : Plugin<Project> {
externalNativeBuild {
cmake {
arguments.add("-DANDROID_SUPPORT_FLEXIBLE_PAGE_SIZES=ON")
arguments.add("-DCMAKE_MODULE_PATH=${rootDir.resolve("cmake")}")
// Determine if the OS is Windows
val isWindows = getProperty("os.name").lowercase().contains("win")
val cmakeModulePath = if (isWindows) {
rootDir.resolve("cmake").toString().replace('\\', '/')
} else {
rootDir.resolve("cmake").toString()
}
arguments.add("-DCMAKE_MODULE_PATH=$cmakeModulePath")
}
}
ndk {
Expand Down