Skip to content
Snippets Groups Projects
Commit 1b0625ea authored by lintao@ihep.ac.cn's avatar lintao@ihep.ac.cn
Browse files

WIP: support ninja build.

parent 55bcd6e2
No related branches found
No related tags found
No related merge requests found
...@@ -30,6 +30,10 @@ function check-cepcsw-envvar() { ...@@ -30,6 +30,10 @@ function check-cepcsw-envvar() {
function build-dir() { function build-dir() {
local blddir=build local blddir=build
if [ -n "${bldtool}" ]; then
blddir=${blddir}.${bldtool}
fi
# If detect the extra env var, append it to the build dir # If detect the extra env var, append it to the build dir
if [ -n "${lcg_version}" ]; then if [ -n "${lcg_version}" ]; then
blddir=${blddir}.${lcg_version} blddir=${blddir}.${lcg_version}
...@@ -58,10 +62,20 @@ function run-cmake() { ...@@ -58,10 +62,20 @@ function run-cmake() {
error: "Failed to create $blddir" error: "Failed to create $blddir"
return 1 return 1
fi fi
local bldgen
if [ -n "$bldtool" ] ; then
case $bldtool in
ninja)
bldgen="-G Ninja"
;;
*)
;;
esac
fi
cd $blddir cd $blddir
cmake .. -DHOST_BINARY_TAG=${lcg_platform} || { cmake .. -DHOST_BINARY_TAG=${lcg_platform} ${bldgen} || {
error: "Failed to cmake" error: "Failed to cmake"
return 1 return 1
} }
...@@ -69,7 +83,7 @@ function run-cmake() { ...@@ -69,7 +83,7 @@ function run-cmake() {
} }
function run-make() { function run-make() {
make cmake --build .
} }
############################################################################## ##############################################################################
...@@ -80,6 +94,8 @@ function run-make() { ...@@ -80,6 +94,8 @@ function run-make() {
lcg_platform=x86_64-centos7-gcc8-opt lcg_platform=x86_64-centos7-gcc8-opt
lcg_version=98.0.0 lcg_version=98.0.0
bldtool=${CEPCSW_BLDTOOL} # make, ninja # set in env var
check-cepcsw-envvar || exit -1 check-cepcsw-envvar || exit -1
check-working-builddir || exit -1 check-working-builddir || exit -1
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment