From 32753c87f35938f74daf1c9e72e531be516e640c Mon Sep 17 00:00:00 2001
From: Lukas Nellen <lukas@nucleares.unam.mx>
Date: Thu, 16 May 2019 15:04:00 -0500
Subject: [PATCH] Never call `make` direclty, always use `cmake --build`
Makes it easier in the future to use ninja as a generator
---
.gitlab-ci.yml | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 1db33a96e..5625241a6 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -37,7 +37,7 @@ coverage:
- cmake .. -DCMAKE_BUILD_TYPE=Coverage
- cmake --build . -- -j4
- ctest -j4 -V >& test.log || gzip -v -9 -S .gz test.log
- - make coverage && tar czf coverage-report.tar.gz coverage-report
+ - cmake --build . --target coverage && tar czf coverage-report.tar.gz coverage-report
artifacts:
expire_in: 1 year
paths:
@@ -55,7 +55,7 @@ pages:
- mkdir build
- cd build
- cmake ..
- - make doxygen
+ - cmake --build . --target doxygen
- mkdir .public
- cp -r Documentation/Doxygen/html .public/
- mv .public ../public
--
GitLab