Commit e3996110 authored by Simon Braß's avatar Simon Braß
Browse files

Fix CMAKE generator/HepMC2 applies cmake_make_install

parent 975b3589
Pipeline #7977 failed with stage
in 12 minutes and 58 seconds
......@@ -50,7 +50,7 @@ if test -z "${CMAKE_GENERATOR}"; then
if test $? -eq 0; then
CMAKE_GENERATOR="Ninja"
else
CMAKE_GENERATOR="Makefile"
CMAKE_GENERATOR="Unix Makefiles"
fi
fi
......@@ -150,7 +150,7 @@ function cmake_make_install () {
# Do not place variable config in quotes as it needs expansion.
cmake ${config} -G "${CMAKE_GENERATOR}" "${cmake_path}" || return
case "${CMAKE_GENERATOR}" in
"Makefile")
"Unix Makefiles")
make -j"${NPROC}" -s V=0 &&
make install -s V=0
;;
......@@ -190,17 +190,14 @@ build_cmake_generic () {
popd
}
build_hepmc () {
build_hepmc2 () {
local url="${1}"
local config="${2}"
local config="${2:-}"
local name="${dir_hepmc}"
test -d "${name}" || download_untar_pkg "${url}"
test ! -d "${name}-build" || rm -rf "${name}-build"
mkdir -p "${name}-build" || return
pushd "${name}-build" && \
cmake ${config} "../${name}" && \
make && \
make install && \
mkdir -p "${name}-build" && \
pushd "${name}-build" && \
cmake_make_install "${config}" "../${name}"
popd
}
......@@ -292,7 +289,7 @@ build_and_log_hepmc () {
local url="${2}"
local config="${3:-}"
echo "Build ${name} ... " && \
build_hepmc "${url}" "${config}" 1>"${LOG}/${name}.log" 2>&1
build_hepmc2 "${url}" "${config}" 1>"${LOG}/${name}.log" 2>&1
if test $? -eq 0; then
echo "... finished."
else
......
Supports Markdown
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment