update conan.cmake; remove conanfile.py (685f85b2) · Commits · exa / csg-eb

.gitlab-ci.yml

+4 −20

Original line number	Diff line number	Diff line
		@@ -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
		@@ -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

+19 −12

Original line number	Diff line number	Diff line
		@@ -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)

+3 −3

Original line number	Diff line number	Diff line
		@@ -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" ]

+381 −90

File changed.

Preview size limit exceeded, changes collapsed.

deleted100644 → 0

+0 −37

Original line number	Diff line number	Diff line
		import sys
		import shutil

		from conans import ConanFile, Meson, tools


		class CsgEbConan(ConanFile):
		name = "csg-eb"
		version = "0.1"
		license = "<Put the package license here>"
		author = "Deepak Rangarajan <Deepak.Rangarajan@netl.doe.gov>"
		url = "https://mfix.netl.doe.gov/gitlab/exa/csg-eb"
		description = "Library for reading CSG geometry files"
		topics = ("<Put some tag here>", "<here>", "<and here>")
		settings = "os", "compiler", "build_type", "arch"
		options = {"shared": [True, False]}
		default_options = {"shared": False}
		generators = "pkg_config"
		requires = ("catch2/2.13.6", "cgal/5.2.1", "taocpp-pegtl/3.2.0")
		build_requires = ("meson/0.58.1",)
		exports_sources = "meson.build", "include/", "src/"

		def build(self):
		meson = Meson(self)
		args = ["-Dcpp_std=vc++latest"] if sys.platform in ("win32", "cygwin") else []
		meson.configure(build_folder="build", args=args)
		if shutil.which("clang-format"):
		meson.build(targets=["clang-format"])
		meson.build()
		meson.meson_test(args=["--verbose", "--print-errorlog"])

		def package(self):
		self.copy("*.h", dst="include", src="csg-eb")
		self.copy("*.a", dst="lib", keep_path=False)

		def package_info(self):
		self.cpp_info.libs = ["csg-eb"]