Loading .gitlab-ci.yml +4 −20 Changes for .gitlab-ci.yml: 4 added lines, 20 removed lines. Original line number Diff line number Diff line Loading @@ -19,26 +19,6 @@ build-img: ###### Test jobs ##### .test:meson: &conan_def stage: test image: $CI_REGISTRY_IMAGE:latest needs: ['build-img'] script: - conan create . -s build_type=$BUILD_TYPE tags: - docker test:meson:debug: variables: BUILD_TYPE: "Debug" <<: *conan_def test:meson:release: variables: BUILD_TYPE: "Release" allow_failure: true <<: *conan_def .test:cmake: &cmake_def stage: test image: $CI_REGISTRY_IMAGE:latest Loading @@ -54,10 +34,14 @@ test:meson:release: test:cmake:debug: variables: BUILD_TYPE: "Debug" CC: "gcc" CXX: "g++" <<: *cmake_def test:cmake:release: variables: BUILD_TYPE: "Release" CC: "gcc" CXX: "g++" allow_failure: true <<: *cmake_def CMakeLists.txt +18 −11 Changes for CMakeLists.txt: 18 added lines, 11 removed lines. Original line number Diff line number Diff line Loading @@ -15,22 +15,29 @@ if(CCACHE_FOUND) set( CMAKE_CXX_COMPILER_LAUNCHER ccache ) endif() find_program(CONAN_FOUND conan) if(CONAN_FOUND) message(STATUS "Using conan found at: ${CONAN_FOUND}") include(conan.cmake) conan_cmake_run(CONANFILE conanfile.py BASIC_SETUP CMAKE_TARGETS) conan_cmake_configure(REQUIRES catch2/2.13.7 cgal/5.2.1 taocpp-pegtl/3.2.1 GENERATORS cmake_find_package) if(CONAN_SETTINGS) set(settings ${CONAN_SETTINGS}) else() message(WARNING "Did not find conan in PATH. Will try download it with PMM <https://github.com/vector-of-bool/pmm>") message(WARNING "Recommend installing Conan with 'pip install conan' <https://conan.io/downloads.html> for faster builds") include(pmm.cmake) pmm(CONAN) conan_basic_setup() include(${CMAKE_CURRENT_BINARY_DIR}/conanbuildinfo.cmake) conan_cmake_autodetect(settings) endif() conan_cmake_install(PATH_OR_REFERENCE . REMOTE conancenter SETTINGS ${settings}) include(CTest) list(APPEND CMAKE_MODULE_PATH ${CMAKE_BINARY_DIR}) find_package(CGAL REQUIRED) find_package(Catch2 REQUIRED) find_package(pegtl REQUIRED) include(Catch) if(NOT CMAKE_SOURCE_DIR STREQUAL CMAKE_CURRENT_SOURCE_DIR) Loading Dockerfile +3 −3 Changes for Dockerfile: 3 added lines, 3 removed lines. Original line number Diff line number Diff line Loading @@ -17,8 +17,8 @@ RUN apt-get -qq update \ && apt-get clean && rm -rf /var/lib/apt/lists/* \ && pip3 install --no-cache-dir \ cmake==3.21.2 \ conan==1.39 \ ninja==1.10.2 cmake==3.* \ conan==1.* \ ninja==1.* CMD [ "/bin/bash" ] conan.cmake +366 −75 File changed.Preview size limit exceeded, changes collapsed. Show changes conanfile.py −37 File deleted. Show changes Loading
.gitlab-ci.yml +4 −20 Changes for .gitlab-ci.yml: 4 added lines, 20 removed lines. Original line number Diff line number Diff line Loading @@ -19,26 +19,6 @@ build-img: ###### Test jobs ##### .test:meson: &conan_def stage: test image: $CI_REGISTRY_IMAGE:latest needs: ['build-img'] script: - conan create . -s build_type=$BUILD_TYPE tags: - docker test:meson:debug: variables: BUILD_TYPE: "Debug" <<: *conan_def test:meson:release: variables: BUILD_TYPE: "Release" allow_failure: true <<: *conan_def .test:cmake: &cmake_def stage: test image: $CI_REGISTRY_IMAGE:latest Loading @@ -54,10 +34,14 @@ test:meson:release: test:cmake:debug: variables: BUILD_TYPE: "Debug" CC: "gcc" CXX: "g++" <<: *cmake_def test:cmake:release: variables: BUILD_TYPE: "Release" CC: "gcc" CXX: "g++" allow_failure: true <<: *cmake_def
CMakeLists.txt +18 −11 Changes for CMakeLists.txt: 18 added lines, 11 removed lines. Original line number Diff line number Diff line Loading @@ -15,22 +15,29 @@ if(CCACHE_FOUND) set( CMAKE_CXX_COMPILER_LAUNCHER ccache ) endif() find_program(CONAN_FOUND conan) if(CONAN_FOUND) message(STATUS "Using conan found at: ${CONAN_FOUND}") include(conan.cmake) conan_cmake_run(CONANFILE conanfile.py BASIC_SETUP CMAKE_TARGETS) conan_cmake_configure(REQUIRES catch2/2.13.7 cgal/5.2.1 taocpp-pegtl/3.2.1 GENERATORS cmake_find_package) if(CONAN_SETTINGS) set(settings ${CONAN_SETTINGS}) else() message(WARNING "Did not find conan in PATH. Will try download it with PMM <https://github.com/vector-of-bool/pmm>") message(WARNING "Recommend installing Conan with 'pip install conan' <https://conan.io/downloads.html> for faster builds") include(pmm.cmake) pmm(CONAN) conan_basic_setup() include(${CMAKE_CURRENT_BINARY_DIR}/conanbuildinfo.cmake) conan_cmake_autodetect(settings) endif() conan_cmake_install(PATH_OR_REFERENCE . REMOTE conancenter SETTINGS ${settings}) include(CTest) list(APPEND CMAKE_MODULE_PATH ${CMAKE_BINARY_DIR}) find_package(CGAL REQUIRED) find_package(Catch2 REQUIRED) find_package(pegtl REQUIRED) include(Catch) if(NOT CMAKE_SOURCE_DIR STREQUAL CMAKE_CURRENT_SOURCE_DIR) Loading
Dockerfile +3 −3 Changes for Dockerfile: 3 added lines, 3 removed lines. Original line number Diff line number Diff line Loading @@ -17,8 +17,8 @@ RUN apt-get -qq update \ && apt-get clean && rm -rf /var/lib/apt/lists/* \ && pip3 install --no-cache-dir \ cmake==3.21.2 \ conan==1.39 \ ninja==1.10.2 cmake==3.* \ conan==1.* \ ninja==1.* CMD [ "/bin/bash" ]