Skip to content
GitLab
Explore
Sign in
Register
Primary navigation
Search or go to…
Project
R
rav1e
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
Terms and privacy
Keyboard shortcuts
?
Snippets
Groups
Projects
Show more breadcrumbs
Xiph.Org
rav1e
Commits
7ada1689
Commit
7ada1689
authored
6 years ago
by
Raphaël Zumer
Committed by
Thomas Daede
6 years ago
Browse files
Options
Downloads
Patches
Plain Diff
Support cmake3 binary in the build script
parent
92a5b174
No related branches found
Branches containing commit
No related tags found
No related merge requests found
Changes
1
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
build.sh
+28
-18
28 additions, 18 deletions
build.sh
with
28 additions
and
18 deletions
build.sh
+
28
−
18
View file @
7ada1689
...
...
@@ -47,30 +47,40 @@ ACTUAL_VERSION=$(git submodule status | xargs)
AOM_TEST
=
"aom_test"
if
[[
"
$ACTUAL_VERSION
"
!=
"
$EXPECTED_VERSION
"
]]
||
[[
!
-f
./
${
AOM_TEST
}
/aomdec
]]
;
then
# Store current version to file
echo
$ACTUAL_VERSION
>
$GITHASH
# Store current version to file
echo
$ACTUAL_VERSION
>
$GITHASH
# Update aombuild
git submodule update
--init
# Update aombuild
git submodule update
--init
# Clean project files
cargo clean
# Clean project files
cargo clean
# Get configure command from readme
CONFIGURE_CMD
=
$(
fgrep
"cmake ../aom"
README.md
)
# Get configure command from readme
CONFIGURE_CMD
=
$(
fgrep
"cmake ../aom"
README.md
)
# Wipe and create aom_test folder
rm
-fR
$AOM_TEST
mkdir
-p
$AOM_TEST
pushd
$AOM_TEST
# Handle cases where the cmake binary is absent or named differently
if
!
[
-x
"
$(
command
-v
cmake
)
"
]
;
then
if
!
[
-x
"
$(
command
-v
cmake3
)
"
]
;
then
echo
"
\`
cmake
\`
is required to build libaom. Aborting."
>
&2
exit
1
fi
echo
CONFIGURE COMMAND
echo
$CONFIGURE_CMD
eval
$CONFIGURE_CMD
CONFIGURE_CMD
=
${
CONFIGURE_CMD
/cmake/cmake3
}
fi
# auto detect the number of cores and parallel build
make
-j
$(
nproc
--all
)
popd
# Wipe and create aom_test folder
rm
-fR
$AOM_TEST
mkdir
-p
$AOM_TEST
pushd
$AOM_TEST
echo
CONFIGURE COMMAND
echo
$CONFIGURE_CMD
eval
$CONFIGURE_CMD
# auto detect the number of cores and parallel build
make
-j
$(
nproc
--all
)
popd
fi
...
...
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