From b1ac6245d080e072655304298e98761ce4d82b50 Mon Sep 17 00:00:00 2001 From: Christoph Niethammer Date: Wed, 25 Sep 2019 23:03:33 +0000 Subject: [PATCH] Use cmake over configure by default. --- functions.sh | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/functions.sh b/functions.sh index 4e18aea..9882511 100644 --- a/functions.sh +++ b/functions.sh @@ -68,15 +68,15 @@ sit_prepare() { src_configure() { - if [ -x ${SRCDIR}/configure ] ; then + if [ -f ${SRCDIR}/CMakeLists.txt ] ; then +#sit_info "Running cmake" + cmake -DCMAKE_INSTALL_PREFIX=$PREFIX $CMAKE_OPTS ${SRCDIR} + elif [ -x ${SRCDIR}/configure ] ; then #sit_info "Runnning configure" ${SRCDIR}/configure --prefix=$PREFIX $CONFIGURE_OPTS if [ ! -z $LOGDIR -a -f config.log ] ; then cp config.log $LOGDIR fi - elif [ -f ${SRCDIR}/CMakeLists.txt ] ; then -#sit_info "Running cmake" - cmake -DCMAKE_INSTALL_PREFIX=$PREFIX $CMAKE_OPTS ${SRCDIR} fi } sit_configure() {