mpusz/mp-units
1
0
Fork 1
mirror of https://github.com/mpusz/mp-units.git synced 2025-07-31 02:47:16 +02:00
Code Issues Packages Projects Releases Wiki Activity

build(conan): default values for Conan options changed

Browse Source
This commit is contained in:
Mateusz Pusz
2024-09-27 12:53:23 +02:00
parent 7a196f47ba
commit 83941d9575
1 changed files with 18 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

31
conanfile.py
View File

@ -201,6 +201,9 @@ class MPUnitsConan(ConanFile):
def config_options(self): def config_options(self):
for key in self._option_feature_map.keys(): for key in self._option_feature_map.keys():
self._set_default_option(key) self._set_default_option(key)
# TODO mixing of `import std;` and regular header files includes does not work for now
if self.options.import_std:
self.options.contracts = "none"
def configure(self): def configure(self):
if self.options.cxx_modules: if self.options.cxx_modules:
@ -236,7 +239,7 @@ class MPUnitsConan(ConanFile):
raise ConanInvalidConfiguration( raise ConanInvalidConfiguration(
"'contracts' should be set to 'none' for a freestanding build" "'contracts' should be set to 'none' for a freestanding build"
) )
# mixing of `import std;` and regular header files includes does not work for now # TODO mixing of `import std;` and regular header files includes does not work for now
if self.options.import_std: if self.options.import_std:
if self.options.contracts != "none": if self.options.contracts != "none":
raise ConanInvalidConfiguration( raise ConanInvalidConfiguration(
@ -251,36 +254,36 @@ class MPUnitsConan(ConanFile):
cmake_layout(self) cmake_layout(self)
def generate(self): def generate(self):
opt = self.options
tc = CMakeToolchain(self) tc = CMakeToolchain(self)
tc.absolute_paths = True # only needed for CMake CI tc.absolute_paths = True # only needed for CMake CI
if self._build_all: if self._build_all:
tc.cache_variables["CMAKE_EXPORT_COMPILE_COMMANDS"] = True tc.cache_variables["CMAKE_EXPORT_COMPILE_COMMANDS"] = True
tc.cache_variables[ tc.cache_variables[
"CMAKE_VERIFY_INTERFACE_HEADER_SETS" "CMAKE_VERIFY_INTERFACE_HEADER_SETS"
] = not self.options.import_std ] = not opt.import_std
tc.cache_variables["MP_UNITS_DEV_BUILD_LA"] = not self._skip_la tc.cache_variables["MP_UNITS_DEV_BUILD_LA"] = not self._skip_la
if self._run_clang_tidy: if self._run_clang_tidy:
tc.cache_variables["MP_UNITS_DEV_CLANG_TIDY"] = True tc.cache_variables["MP_UNITS_DEV_CLANG_TIDY"] = True
if self.options.cxx_modules: if opt.cxx_modules:
tc.cache_variables["CMAKE_CXX_SCAN_FOR_MODULES"] = True tc.cache_variables["CMAKE_CXX_SCAN_FOR_MODULES"] = True
tc.cache_variables["MP_UNITS_BUILD_CXX_MODULES"] = True tc.cache_variables["MP_UNITS_BUILD_CXX_MODULES"] = True
if self.options.import_std: if opt.import_std:
tc.cache_variables["CMAKE_CXX_MODULE_STD"] = True tc.cache_variables["CMAKE_CXX_MODULE_STD"] = True
# Current experimental support according to `Help/dev/experimental.rst` # Current experimental support according to `Help/dev/experimental.rst`
tc.cache_variables[ tc.cache_variables[
"CMAKE_EXPERIMENTAL_CXX_IMPORT_STD" "CMAKE_EXPERIMENTAL_CXX_IMPORT_STD"
] = "0e5b6991-d74f-4b3d-a41c-cf096e0b2508" ] = "0e5b6991-d74f-4b3d-a41c-cf096e0b2508"
if self.options.freestanding:
# TODO remove the below when Conan will learn to handle C++ modules
if opt.freestanding:
tc.cache_variables["MP_UNITS_API_FREESTANDING"] = True tc.cache_variables["MP_UNITS_API_FREESTANDING"] = True
else: else:
tc.cache_variables["MP_UNITS_API_STD_FORMAT"] = self.options.std_format tc.cache_variables["MP_UNITS_API_STD_FORMAT"] = opt.std_format
tc.cache_variables[ tc.cache_variables["MP_UNITS_API_STRING_VIEW_RET"] = opt.string_view_ret
"MP_UNITS_API_STRING_VIEW_RET" tc.cache_variables["MP_UNITS_API_NO_CRTP"] = opt.no_crtp
] = self.options.string_view_ret tc.cache_variables["MP_UNITS_API_CONTRACTS"] = str(opt.contracts).upper()
tc.cache_variables["MP_UNITS_API_NO_CRTP"] = self.options.no_crtp
tc.cache_variables["MP_UNITS_API_CONTRACTS"] = str(
self.options.contracts
).upper()
tc.generate() tc.generate()
deps = CMakeDeps(self) deps = CMakeDeps(self)
deps.generate() deps.generate()
@ -305,6 +308,7 @@ class MPUnitsConan(ConanFile):
) )
cmake = CMake(self) cmake = CMake(self)
cmake.install() cmake.install()
# TODO remove the below when Conan will learn to handle C++ modules
if not self.options.cxx_modules: if not self.options.cxx_modules:
# We have to preserve those files for C++ modules build as Conan # We have to preserve those files for C++ modules build as Conan
# can't generate such CMake targets for now # can't generate such CMake targets for now
@ -312,6 +316,7 @@ class MPUnitsConan(ConanFile):
def package_info(self): def package_info(self):
compiler = self.settings.compiler compiler = self.settings.compiler
# TODO remove the branch when Conan will learn to handle C++ modules
if self.options.cxx_modules: if self.options.cxx_modules:
# CMakeDeps does not generate C++ modules definitions for now # CMakeDeps does not generate C++ modules definitions for now
# Skip the Conan-generated files and use the mp-unitsConfig.cmake bundled with mp-units # Skip the Conan-generated files and use the mp-unitsConfig.cmake bundled with mp-units