From 2031253a9df9fa5a572147dadccfa5d3f3be0753 Mon Sep 17 00:00:00 2001
From: Joseph Walton-Rivers <joseph@walton-rivers.uk>
Date: Thu, 21 Apr 2022 19:30:29 +0100
Subject: [PATCH] ensure cmake is installed
---
.gitlab-ci.yml | 2 +-
CMakeLists.txt | 2 +-
2 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 9ad3db4..1896c9b 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -41,7 +41,7 @@ build:debian:
image: debian:stable
stage: build
before_script:
- - apt update && apt install -y build-essential python3-pip
+ - apt update && apt install -y build-essential python3-pip cmake
- pip install conan
script:
- cmake -S . -B build -DCMAKE_BUILD_TYPE=Debug
diff --git a/CMakeLists.txt b/CMakeLists.txt
index c05c1b2..7a6431a 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -17,7 +17,7 @@ if (CMAKE_PROJECT_NAME STREQUAL PROJECT_NAME)
if ( FGGL_CONAN )
set(CMAKE_MODULE_PATH ${CMAKE_BINARY_DIR} ${CMAKE_MODULE_PATH})
set(CMAKE_PREFIX_PATH ${CMAKE_BINARY_DIR} ${CMAKE_PREFIX_PATH})
- include( cmake/conan.cmake )
+ include( ${CMAKE_CURRENT_SOURCE_DIR}/cmake/conan.cmake )
conan_cmake_configure(
REQUIRES
--
GitLab