From 58f9db8e9b5cbfbbff8215dcf2df2c0de23bd434 Mon Sep 17 00:00:00 2001
From: Mark Meredith <mark.meredith@netl.doe.gov>
Date: Wed, 27 Oct 2021 12:24:43 -0400
Subject: [PATCH 1/3] Get conan.cmake from submodule

---
 .gitmodules             |  3 +++
 CMakeLists.txt          | 10 +---------
 subprojects/cmake-conan |  1 +
 3 files changed, 5 insertions(+), 9 deletions(-)
 create mode 160000 subprojects/cmake-conan

diff --git a/.gitmodules b/.gitmodules
index e69de29..a14955f 100644
--- a/.gitmodules
+++ b/.gitmodules
@@ -0,0 +1,3 @@
+[submodule "subprojects/cmake-conan"]
+	path = subprojects/cmake-conan
+	url = https://github.com/conan-io/cmake-conan
diff --git a/CMakeLists.txt b/CMakeLists.txt
index 75ae1dd..b8ce7de 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -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})
diff --git a/subprojects/cmake-conan b/subprojects/cmake-conan
new file mode 160000
index 0000000..43e3858
--- /dev/null
+++ b/subprojects/cmake-conan
@@ -0,0 +1 @@
+Subproject commit 43e385830ee35377dbd2dcbe8d5a9e750301ea00
-- 
GitLab


From 3ae5dbdf9475ee058672c93d904933dfc6173238 Mon Sep 17 00:00:00 2001
From: Mark Meredith <mark.meredith@netl.doe.gov>
Date: Wed, 27 Oct 2021 12:24:56 -0400
Subject: [PATCH 2/3] cleanup warnings

---
 src/csg_cgal_helper.hpp | 5 -----
 1 file changed, 5 deletions(-)

diff --git a/src/csg_cgal_helper.hpp b/src/csg_cgal_helper.hpp
index 7dbded3..541b41c 100644
--- a/src/csg_cgal_helper.hpp
+++ b/src/csg_cgal_helper.hpp
@@ -1,17 +1,12 @@
 #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 {
 
-- 
GitLab


From b778b37913f580f7d8414566daf13b1871f99506 Mon Sep 17 00:00:00 2001
From: Mark Meredith <mark.meredith@netl.doe.gov>
Date: Wed, 27 Oct 2021 12:53:35 -0400
Subject: [PATCH 3/3] Use calendar versioning for CSG-EB

---
 .gitlab-ci.yml | 2 +-
 CMakeLists.txt | 2 +-
 conanfile.py   | 6 +++---
 3 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 865624e..185faf6 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -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
 
diff --git a/CMakeLists.txt b/CMakeLists.txt
index b8ce7de..0970362 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -37,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(
diff --git a/conanfile.py b/conanfile.py
index 4db1fc6..928b3f2 100644
--- a/conanfile.py
+++ b/conanfile.py
@@ -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):
-- 
GitLab