Skip to content
GitLab
Explore
Sign in
Primary navigation
Search or go to…
Project
F
Firmware
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
Package Registry
Model registry
Operate
Environments
Terraform modules
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
Terms and privacy
Keyboard shortcuts
?
Snippets
Groups
Projects
Show more breadcrumbs
Alberto Ruiz Garcia
Firmware
Commits
fb3465c1
Commit
fb3465c1
authored
9 years ago
by
Daniel Agar
Committed by
Lorenz Meier
9 years ago
Browse files
Options
Downloads
Patches
Plain Diff
Makefile fix /bin/shs ninja check
parent
84217429
No related branches found
Branches containing commit
No related tags found
Tags containing commit
No related merge requests found
Changes
1
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
Makefile
+1
-2
1 addition, 2 deletions
Makefile
with
1 addition
and
2 deletions
Makefile
+
1
−
2
View file @
fb3465c1
...
...
@@ -67,7 +67,6 @@ all: px4fmu-v2_default
ARGS
:=
$(
wordlist 2,
$(
words
$(
MAKECMDGOALS
))
,
$(
MAKECMDGOALS
))
j
?=
4
# disable ninja by default for now because it hides upload progress
NINJA_BUILD
:=
$(
shell ninja
--version
2>/dev/null
)
ifdef
NINJA_BUILD
PX4_CMAKE_GENERATOR
?=
"Ninja"
...
...
@@ -89,7 +88,7 @@ endif
# --------------------------------------------------------------------
# describe how to build a cmake config
define
cmake-build
+@if
[
$(PX4_CMAKE_GENERATOR)
=
=
"Ninja"
]
&&
[
-e
$(
PWD
)
/build_
$@
/Makefile
]
;
then
rm
-rf
$(
PWD
)
/build_
$@
;
fi
+@if
[
$(PX4_CMAKE_GENERATOR)
=
"Ninja"
]
&&
[
-e
$(
PWD
)
/build_
$@
/Makefile
]
;
then
rm
-rf
$(
PWD
)
/build_
$@
;
fi
+@if
[
!
-e
$(PWD)/build_$@/CMakeCache.txt
];
then
git
submodule
update
--init
--recursive
--force
&&
mkdir
-p
$(PWD)/build_$@
&&
cd
$(PWD)/build_$@
&&
cmake
..
-G$(PX4_CMAKE_GENERATOR)
-DCONFIG
=
$(
1
);
fi
+$(PX4_MAKE)
-C
$(PWD)/build_$@
$(PX4_MAKE_ARGS)
$(ARGS)
endef
...
...
This diff is collapsed.
Click to expand it.
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