From 5f2cb780376592b967869544a0178e09a64ddfda Mon Sep 17 00:00:00 2001 From: Mateusz Pusz Date: Fri, 27 Sep 2024 07:53:13 +0200 Subject: [PATCH] build: `package_type` is dynamically set in conanfile.py depending if we build modules or not --- CHANGELOG.md | 1 + conanfile.py | 11 +++++++---- 2 files changed, 8 insertions(+), 4 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 7959cc0f..ceb98165 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -68,6 +68,7 @@ - build: `generate()` in `test_package` now correctly propagates project's options - build: `target_include_directories` is not needed anymore - build: `target_compile_features` now uses `CMAKE_CXX_STANDARD` +- build: `package_type` is dynamically set in conanfile.py depending if we build modules or not - ci: added test for upstream clang on macos-14, as an example for an arm64 platform by [@burnpanck](https://github.com/burnpanck) - style: pre-commit updated to clang-format-18.1.8 - docs: "Strong Angular System" chapter added diff --git a/conanfile.py b/conanfile.py index 0ba39993..d1170db4 100644 --- a/conanfile.py +++ b/conanfile.py @@ -82,7 +82,6 @@ class MPUnitsConan(ConanFile): "example/*", "CMakeLists.txt", ) - package_type = "header-library" no_copy_source = True @property @@ -204,17 +203,21 @@ class MPUnitsConan(ConanFile): self._set_default_option(key) def configure(self): + if self.options.cxx_modules: + self.package_type = "static-library" + else: + self.package_type = "header-library" if self.options.freestanding: self.options.rm_safe("std_format") def requirements(self): if not self.options.freestanding: if self.options.contracts == "gsl-lite": - self.requires("gsl-lite/0.41.0") + self.requires("gsl-lite/0.41.0", transitive_headers=True) elif self.options.contracts == "ms-gsl": - self.requires("ms-gsl/4.0.0") + self.requires("ms-gsl/4.0.0", transitive_headers=True) if not self.options.std_format: - self.requires("fmt/11.0.1") + self.requires("fmt/11.0.1", transitive_headers=True) def build_requirements(self): self.tool_requires("cmake/[>=3.30 <4]")