diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 9ad3db45524cb305084c7f360277a4beae5dd3e9..1896c9bfae78ef0fedd197651bf4db62c289c395 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 c05c1b28cd5757fd8b98379393b658689470d56f..7a6431a10faa4c74e2eda5d2101dbc57d2a8524d 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