Commit e1a31dca authored by Mark Meredith's avatar Mark Meredith
Browse files

Resolve "Cannot build without network access"

parent 2d3abd76

.gitlab-ci.yml

+1 −1
Original line number Diff line number Diff line
@@ -29,7 +29,7 @@ build-img: 
  script:

    - conan create . exa/stable -s compiler=${COMPILER} -s compiler.version=${CVERSION} -s compiler.libcxx=${LIBCXX}

    - conan remote add ${REPO} ${CI_API_V4_URL}/projects/$CI_PROJECT_ID/packages/conan

    - conan upload csg-eb/0.1@exa/stable --all --remote=${REPO}

    - conan upload csg-eb/2021.10.27@exa/stable --all --remote=${REPO}

  tags:

    - docker

.gitmodules

+3 −0
Original line number Diff line number Diff line 
[submodule "subprojects/cmake-conan"]

	path = subprojects/cmake-conan

	url = https://github.com/conan-io/cmake-conan

CMakeLists.txt

+2 −10
Original line number Diff line number Diff line
@@ -10,15 +10,7 @@ set(CMAKE_CXX_STANDARD 17) 
set(CMAKE_CXX_STANDARD_REQUIRED ON)

set(CMAKE_CXX_EXTENSIONS OFF)



if(NOT EXISTS "${CMAKE_BINARY_DIR}/conan.cmake")

   message(STATUS "Downloading conan.cmake from https://github.com/conan-io/cmake-conan")

   file(DOWNLOAD "https://raw.githubusercontent.com/conan-io/cmake-conan/v0.16.1/conan.cmake"

      "${CMAKE_BINARY_DIR}/conan.cmake"

      EXPECTED_HASH SHA256=396e16d0f5eabdc6a14afddbcfff62a54a7ee75c6da23f32f7a31bc85db23484

      TLS_VERIFY ON)

endif()



include(${CMAKE_BINARY_DIR}/conan.cmake)

include(${CMAKE_CURRENT_SOURCE_DIR}/subprojects/cmake-conan/conan.cmake)



if(CONAN_SETTINGS)

   set(settings ${CONAN_SETTINGS})
@@ -45,7 +37,7 @@ conan_cmake_install(PATH_OR_REFERENCE ${CMAKE_CURRENT_BINARY_DIR}/conanfile.txt 
   SETTINGS ${settings})



conan_cmake_configure(REQUIRES

   csg-eb/0.1@exa/stable

   csg-eb/2021.10.27@exa/stable

   GENERATORS cmake_find_package)



conan_add_remote(

conanfile.py

+3 −3
Original line number Diff line number Diff line
@@ -6,7 +6,7 @@ from conans import ConanFile, Meson 


class CsgEbConan(ConanFile):

    name = "csg-eb"

    version = "0.1"

    version = "2021.10.27"

    license = "<Put the package license here>"

    author = "Deepak Rangarajan <Deepak.Rangarajan@netl.doe.gov>"

    url = "https://mfix.netl.doe.gov/gitlab/exa/csg-eb"
@@ -16,8 +16,8 @@ class CsgEbConan(ConanFile): 
    options = {"shared": [True, False]}

    default_options = {"shared": False}

    generators = "pkg_config"

    requires = ("catch2/2.13.7", "cgal/5.2.1", "taocpp-pegtl/3.2.0")

    build_requires = ("meson/0.59.2", "pkgconf/1.7.4", "ninja/1.10.2")

    requires = ("catch2/2.13.7", "cgal/5.2.1", "taocpp-pegtl/3.2.1")

    build_requires = ("meson/0.60.0", "pkgconf/1.7.4", "ninja/1.10.2")

    exports_sources = "meson.build", "include/*", "src/*"



    def build(self):

src/csg_cgal_helper.hpp

+0 −5
Original line number Diff line number Diff line 
#ifndef CGAL_HELPER_H_

#define CGAL_HELPER_H_



#pragma GCC diagnostic ignored "-Wpedantic"

#pragma warning(disable : 4083)

#pragma warning(disable : 4244)

#include <CGAL/Exact_predicates_inexact_constructions_kernel.h>

#include <CGAL/Polygon_2.h>

#include <CGAL/Polyhedron_3.h>

#include <CGAL/Side_of_triangle_mesh.h>

#include <CGAL/Simple_cartesian.h>

#include <memory>

#pragma GCC diagnostic pop

#pragma warning default



namespace cgal_helper {