From 233ca42023214f0d51a05d42f9a7d212e7432f7e Mon Sep 17 00:00:00 2001
From: Jan David Mol <mol@astron.nl>
Date: Thu, 1 Dec 2022 00:07:22 +0100
Subject: [PATCH] Use cmake 3.x to build LOFAR

---
 .gitlab-ci.yml | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 3b3e7c64ab4..95c31aceba4 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -33,7 +33,7 @@ variables:
   - echo "Building $PACKAGE..."
   - mkdir -p build/gnucxx11_opt
   - cd build/gnucxx11_opt
-  - cmake -DBUILD_PACKAGES=$PACKAGE -DUSE_PYTHON=$USE_PYTHON -DWINCC_ROOT_DIR=/opt/WinCC_OA/3.16/ -DBLITZ_ROOT_DIR=/opt/blitz/ -DCASACORE_ROOT_DIR=/opt/casacore/ -DCMAKE_INSTALL_PREFIX=/opt/lofar ../..
+  - cmake3 -DBUILD_PACKAGES=$PACKAGE -DUSE_PYTHON=$USE_PYTHON -DWINCC_ROOT_DIR=/opt/WinCC_OA/3.16/ -DBLITZ_ROOT_DIR=/opt/blitz/ -DCASACORE_ROOT_DIR=/opt/casacore/ -DCMAKE_INSTALL_PREFIX=/opt/lofar ../..
   - make -j $(nproc)
   - make DESTDIR=${CI_BUILDS_DIR}/${CI_COMMIT_SHORT_SHA}/install install
   - cd ${CI_BUILDS_DIR}/${CI_COMMIT_SHORT_SHA}/install/opt/lofar
@@ -140,7 +140,7 @@ build_SCU:
     - mkdir -p build/gnucxx11_opt
     - mkdir -p build/gnucxx11_opt/install
     - cd build/gnucxx11_opt
-    - cmake -DBUILD_PACKAGES="SCU TMSSFrontend" -DUSE_PYTHON=$USE_PYTHON -DCASACORE_ROOT_DIR=/opt/casacore/ -DCASAREST_ROOT_DIR=/opt/casarest/ -DUSE_LOG4CPLUS=false -DCMAKE_INSTALL_PREFIX=/opt/lofar ../..
+    - cmake3 -DBUILD_PACKAGES="SCU TMSSFrontend" -DUSE_PYTHON=$USE_PYTHON -DCASACORE_ROOT_DIR=/opt/casacore/ -DCASAREST_ROOT_DIR=/opt/casarest/ -DUSE_LOG4CPLUS=false -DCMAKE_INSTALL_PREFIX=/opt/lofar ../..
     - make -j $(nproc)
     - make DESTDIR=install install
     - cd install/opt/lofar
@@ -164,7 +164,7 @@ build_LTAIngest:
     - mkdir -p build/gnucxx11_opt
     - mkdir -p build/gnucxx11_opt/install
     - cd build/gnucxx11_opt
-    - cmake -DBUILD_PACKAGES="$PACKAGE" -DUSE_PYTHON=$USE_PYTHON -DUSE_LOG4CPLUS=false -DCMAKE_INSTALL_PREFIX=/opt/lofar ../..
+    - cmake3 -DBUILD_PACKAGES="$PACKAGE" -DUSE_PYTHON=$USE_PYTHON -DUSE_LOG4CPLUS=false -DCMAKE_INSTALL_PREFIX=/opt/lofar ../..
     - make -j $(nproc)
     - make DESTDIR=install install
     - cd install/opt/lofar
@@ -254,7 +254,7 @@ build_COBALT_GPUProc:
     - mkdir -p build/gnucxx11_2018_optarch
     - mkdir -p build/gnucxx11_2018_optarch/install
     - cd build/gnucxx11_2018_optarch
-    - cmake -DBUILD_PACKAGES="${PACKAGE}" -DUSE_CUDA=ON -DUSE_MPI=ON -DUSE_OPENMP=ON -DCMAKE_INSTALL_PREFIX=/opt/lofar-versions/${CI_COMMIT_REF_NAME} ../..
+    - cmake3 -DBUILD_PACKAGES="${PACKAGE}" -DUSE_CUDA=ON -DUSE_MPI=ON -DUSE_OPENMP=ON -DCMAKE_INSTALL_PREFIX=/opt/lofar-versions/${CI_COMMIT_REF_NAME} ../..
     - make -j $(nproc)
     - make DESTDIR=install install
     - cd install # COBALT tarballs start at /, see RTCP/Cobalt/GPUProc/src/scripts/Cobalt_install.sh
@@ -284,7 +284,7 @@ build_COBALT_OutputProc:
     - mkdir -p build/gnucxx11_optarch
     - mkdir -p build/gnucxx11_optarch/install
     - cd build/gnucxx11_optarch
-    - cmake -DBUILD_PACKAGES=${PACKAGE} -DBUILD_TESTING=OFF -DCMAKE_INSTALL_PREFIX=/opt/outputproc-versions/${CI_COMMIT_REF_NAME} -DCASACORE_ROOT_DIR=/opt/casacore-${CASACORE_VERSION}/ -DDAL_ROOT_DIR=/opt/DAL-${DAL_VERSION} -DUSE_OPENMP=True ../..
+    - cmake3 -DBUILD_PACKAGES=${PACKAGE} -DBUILD_TESTING=OFF -DCMAKE_INSTALL_PREFIX=/opt/outputproc-versions/${CI_COMMIT_REF_NAME} -DCASACORE_ROOT_DIR=/opt/casacore-${CASACORE_VERSION}/ -DDAL_ROOT_DIR=/opt/DAL-${DAL_VERSION} -DUSE_OPENMP=True ../..
 
     - make -j $(nproc)
     - make DESTDIR=install install
@@ -318,7 +318,7 @@ build_Docker:
     - echo "Building $PACKAGE..."
     - mkdir -p build/gnucxx11_opt
     - cd build/gnucxx11_opt
-    - cmake -DBUILD_PACKAGES="$PACKAGE" ../..
+    - cmake3 -DBUILD_PACKAGES="$PACKAGE" ../..
     - make -j $(nproc)
     - make install  # this puts Dockerfile and dependencies like rc files in a place that can be used as build context
   interruptible: true
-- 
GitLab