matrixfurry.com
The open source OpenXR runtime
Revert "gradle: Only forward EIGEN3_INCLUDE_DIR definition if we actually have it set."
This reverts commit 0868a90a1f299275a37b2443cf5ba90c5030ed5b.
+4
-8
+2
-2
build.gradle
+2
-2
build.gradle
···
48
48
sharedMinSdk = 26
49
49
50
50
// If you are building on Windows, you will need to explicitly set eigenIncludeDir in your
51
-
// local.properties file
52
-
eigenIncludeDir = project.findProperty('eigenIncludeDir')
51
+
// local.properties file since the default value provided below only makes sense on *nix
52
+
eigenIncludeDir = project.findProperty('eigenIncludeDir') ?: '/usr/include/eigen3'
53
53
54
54
// If you're having trouble with a "can't find python" CMake error, you can specify the path to
55
55
// Python 3 explicitly in local.properties with a property named "pythonBinary"
+2
-6
src/xrt/targets/openxr_android/build.gradle
+2
-6
src/xrt/targets/openxr_android/build.gradle
···
89
89
90
90
externalNativeBuild {
91
91
cmake {
92
-
arguments "-DANDROID_PLATFORM=26", "-DANDROID_STL=c++_shared", "-DANDROID_ARM_NEON=TRUE"
92
+
arguments "-DEIGEN3_INCLUDE_DIR=${project.eigenIncludeDir}", "-DANDROID_PLATFORM=26", "-DANDROID_STL=c++_shared", "-DANDROID_ARM_NEON=TRUE"
93
93
94
94
}
95
95
if (project.pythonBinary != null) {
96
-
println "Path to Python 3 explicitly specified: pythonBinary=${project.pythonBinary}"
96
+
println "Path to Python 3 explicitly specified: ${project.pythonBinary}"
97
97
cmake.arguments "-DPYTHON_EXECUTABLE=${project.pythonBinary}"
98
-
}
99
-
if (project.eigenIncludeDir != null) {
100
-
println "Path to Eigen3 includes explicitly specified: eigenIncludeDir=${project.eigenIncludeDir}"
101
-
cmake.arguments "-DEIGEN3_INCLUDE_DIR=${project.eigenIncludeDir}"
102
98
}
103
99
}
104
100