Skip to content
GitLab
Explore
Sign in
Primary navigation
Search or go to…
Project
M
monado
Manage
Activity
Members
Labels
Plan
Issues
Issue boards
Milestones
Wiki
Code
Merge requests
Repository
Branches
Commits
Tags
Repository graph
Compare revisions
Snippets
Build
Pipelines
Jobs
Pipeline schedules
Artifacts
Deploy
Releases
Container Registry
Model registry
Operate
Environments
Monitor
Incidents
Analyze
Value stream analytics
Contributor analytics
CI/CD analytics
Repository analytics
Model experiments
Help
Help
Support
GitLab documentation
Compare GitLab plans
Community forum
Contribute to GitLab
Provide feedback
Keyboard shortcuts
?
Snippets
Groups
Projects
Show more breadcrumbs
blender
monado
Commits
0868a90a
Commit
0868a90a
authored
4 years ago
by
Ryan Pavlik
Committed by
Jakob Bornecrantz
3 years ago
Browse files
Options
Downloads
Patches
Plain Diff
gradle: Only forward EIGEN3_INCLUDE_DIR definition if we actually have it set.
parent
d65829c6
No related branches found
Branches containing commit
No related tags found
No related merge requests found
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
build.gradle
+2
-2
2 additions, 2 deletions
build.gradle
src/xrt/targets/openxr_android/build.gradle
+6
-2
6 additions, 2 deletions
src/xrt/targets/openxr_android/build.gradle
with
8 additions
and
4 deletions
build.gradle
+
2
−
2
View file @
0868a90a
...
@@ -48,8 +48,8 @@ ext {
...
@@ -48,8 +48,8 @@ ext {
sharedMinSdk
=
26
sharedMinSdk
=
26
// If you are building on Windows, you will need to explicitly set eigenIncludeDir in your
// If you are building on Windows, you will need to explicitly set eigenIncludeDir in your
// local.properties file
since the default value provided below only makes sense on *nix
// local.properties file
eigenIncludeDir
=
project
.
findProperty
(
'eigenIncludeDir'
)
?:
'/usr/include/eigen3'
eigenIncludeDir
=
project
.
findProperty
(
'eigenIncludeDir'
)
// If you're having trouble with a "can't find python" CMake error, you can specify the path to
// If you're having trouble with a "can't find python" CMake error, you can specify the path to
// Python 3 explicitly in local.properties with a property named "pythonBinary"
// Python 3 explicitly in local.properties with a property named "pythonBinary"
...
...
This diff is collapsed.
Click to expand it.
src/xrt/targets/openxr_android/build.gradle
+
6
−
2
View file @
0868a90a
...
@@ -89,13 +89,17 @@ android {
...
@@ -89,13 +89,17 @@ android {
externalNativeBuild
{
externalNativeBuild
{
cmake
{
cmake
{
arguments
"-DEIGEN3_INCLUDE_DIR=${project.eigenIncludeDir}"
,
"-DANDROID_PLATFORM=26"
,
"-DANDROID_STL=c++_shared"
,
"-DANDROID_ARM_NEON=TRUE"
arguments
"-DANDROID_PLATFORM=26"
,
"-DANDROID_STL=c++_shared"
,
"-DANDROID_ARM_NEON=TRUE"
}
}
if
(
project
.
pythonBinary
!=
null
)
{
if
(
project
.
pythonBinary
!=
null
)
{
println
"Path to Python 3 explicitly specified: ${project.pythonBinary}"
println
"Path to Python 3 explicitly specified:
pythonBinary=
${project.pythonBinary}"
cmake
.
arguments
"-DPYTHON_EXECUTABLE=${project.pythonBinary}"
cmake
.
arguments
"-DPYTHON_EXECUTABLE=${project.pythonBinary}"
}
}
if
(
project
.
eigenIncludeDir
!=
null
)
{
println
"Path to Eigen3 includes explicitly specified: eigenIncludeDir=${project.eigenIncludeDir}"
cmake
.
arguments
"-DEIGEN3_INCLUDE_DIR=${project.eigenIncludeDir}"
}
}
}
// Be sure to copy over licenses formatted as required.
// Be sure to copy over licenses formatted as required.
...
...
This diff is collapsed.
Click to expand it.
Milan Jaros
@milanjaros
mentioned in commit
d11ef4ae
·
3 years ago
mentioned in commit
d11ef4ae
mentioned in commit d11ef4ae1ea098ebd5dbf60d04682055d753089c
Toggle commit list
Preview
0%
Loading
Try again
or
attach a new file
.
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Save comment
Cancel
Please
register
or
sign in
to comment