From 512406e900f03eb42435b47bc55c34eff953029f Mon Sep 17 00:00:00 2001 From: Mateusz Pusz Date: Tue, 6 Apr 2021 16:30:26 +0200 Subject: [PATCH] build: got rid of global options for `references` and `literals` --- conanfile.py | 6 ---- docs/usage.rst | 38 --------------------- src/CMakeLists.txt | 5 --- src/cmake/AddUnitsModule.cmake | 12 ------- src/core/CMakeLists.txt | 5 --- src/systems/isq-iec80000/CMakeLists.txt | 2 +- src/systems/isq-natural/CMakeLists.txt | 2 +- src/systems/si-cgs/CMakeLists.txt | 2 +- src/systems/si-fps/CMakeLists.txt | 2 +- src/systems/si-iau/CMakeLists.txt | 2 +- src/systems/si-imperial/CMakeLists.txt | 2 +- src/systems/si-international/CMakeLists.txt | 2 +- src/systems/si-typographic/CMakeLists.txt | 2 +- src/systems/si-us/CMakeLists.txt | 2 +- src/systems/si/CMakeLists.txt | 2 +- 15 files changed, 10 insertions(+), 76 deletions(-) diff --git a/conanfile.py b/conanfile.py index 2940d0d6..28ba6bae 100644 --- a/conanfile.py +++ b/conanfile.py @@ -41,14 +41,10 @@ class UnitsConan(ConanFile): "gsl-lite/0.37.0" ) options = { - "references": [True, False], - "literals": [True, False], "downcast_mode": ["off", "on", "auto"], "build_docs": [True, False] } default_options = { - "references": True, - "literals": False, "downcast_mode": "on", "build_docs": True } @@ -120,8 +116,6 @@ class UnitsConan(ConanFile): def generate(self): tc = CMakeToolchain(self) - tc.variables["UNITS_REFERENCES"] = self.options.references - tc.variables["UNITS_LITERALS"] = self.options.literals tc.variables["UNITS_DOWNCAST_MODE"] = str(self.options.downcast_mode).upper() # if self._run_tests: # TODO Enable this when environment is supported in the Conan toolchain tc.variables["UNITS_BUILD_DOCS"] = self.options.build_docs diff --git a/docs/usage.rst b/docs/usage.rst index 83ef4fab..e074f941 100644 --- a/docs/usage.rst +++ b/docs/usage.rst @@ -123,24 +123,6 @@ It also runs unit tests during Conan build. Conan Options ^^^^^^^^^^^^^ -references -++++++++++ - -**Values**: ``True``/``False`` - -**Defaulted to**: ``True`` - -Determines if library should provide Quantity References for quantities of various units. - -literals -++++++++ - -**Values**: ``True``/``False`` - -**Defaulted to**: ``False`` - -Determines if library should provide User Defined Literals (UDLs) for quantities of various units. - downcast_mode +++++++++++++ @@ -167,26 +149,6 @@ Additionally, enables project documentation generation when the project is being CMake Options ^^^^^^^^^^^^^ -UNITS_REFERENCES -++++++++++++++++ - -**Values**: ``ON``/``OFF`` - -**Defaulted to**: ``ON`` - -Equivalent to `references`_. - - -UNITS_LITERALS -++++++++++++++ - -**Values**: ``ON``/``OFF`` - -**Defaulted to**: ``OFF`` - -Equivalent to `literals`_. - - UNITS_DOWNCAST_MODE +++++++++++++++++++ diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt index 6af8b3b6..5a1fd389 100644 --- a/src/CMakeLists.txt +++ b/src/CMakeLists.txt @@ -27,12 +27,7 @@ project(mp-units ) option(UNITS_AS_SYSTEM_HEADERS "Exports library as system headers" OFF) -option(UNITS_REFERENCES "Enables definitions of Quantity References provided for quantities of various units" ON) -option(UNITS_LITERALS "Enables definitions of User Defined Literals (UDLs) provided for quantities of various units" OFF) - message(STATUS "UNITS_AS_SYSTEM_HEADERS: ${UNITS_AS_SYSTEM_HEADERS}") -message(STATUS "UNITS_REFERENCES: ${UNITS_REFERENCES}") -message(STATUS "UNITS_LITERALS: ${UNITS_LITERALS}") list(APPEND CMAKE_MODULE_PATH "${PROJECT_SOURCE_DIR}/cmake") diff --git a/src/cmake/AddUnitsModule.cmake b/src/cmake/AddUnitsModule.cmake index 856c4921..a9c9a83c 100644 --- a/src/cmake/AddUnitsModule.cmake +++ b/src/cmake/AddUnitsModule.cmake @@ -38,15 +38,3 @@ function(add_units_module name) install(TARGETS mp-units-${name} EXPORT mp-unitsTargets) install(DIRECTORY include/units TYPE INCLUDE) endfunction() - - -# -# add_units_systems(ModuleName ...) -# -function(add_units_system name) - add_units_module(${name} ${ARGN}) - target_compile_definitions(mp-units-${name} INTERFACE - $<$:UNITS_REFERENCES> - $<$:UNITS_LITERALS> - ) -endfunction() diff --git a/src/core/CMakeLists.txt b/src/core/CMakeLists.txt index 0b5539ac..d4f4f06c 100644 --- a/src/core/CMakeLists.txt +++ b/src/core/CMakeLists.txt @@ -55,11 +55,6 @@ elseif(CMAKE_CXX_COMPILER_ID STREQUAL "MSVC") ) endif() -target_compile_definitions(mp-units-core INTERFACE - $<$:UNITS_REFERENCES> - $<$:UNITS_LITERALS> -) - if(DEFINED UNITS_DOWNCAST_MODE) set(downcast_mode_options OFF ON AUTO) list(FIND downcast_mode_options "${UNITS_DOWNCAST_MODE}" downcast_mode) diff --git a/src/systems/isq-iec80000/CMakeLists.txt b/src/systems/isq-iec80000/CMakeLists.txt index b02996d9..9f37c6f6 100644 --- a/src/systems/isq-iec80000/CMakeLists.txt +++ b/src/systems/isq-iec80000/CMakeLists.txt @@ -22,4 +22,4 @@ cmake_minimum_required(VERSION 3.15) -add_units_system(isq-iec80000 mp-units::si) +add_units_module(isq-iec80000 mp-units::si) diff --git a/src/systems/isq-natural/CMakeLists.txt b/src/systems/isq-natural/CMakeLists.txt index 1de5f50f..7f9353b4 100644 --- a/src/systems/isq-natural/CMakeLists.txt +++ b/src/systems/isq-natural/CMakeLists.txt @@ -22,4 +22,4 @@ cmake_minimum_required(VERSION 3.15) -add_units_system(isq-natural mp-units::isq) +add_units_module(isq-natural mp-units::isq) diff --git a/src/systems/si-cgs/CMakeLists.txt b/src/systems/si-cgs/CMakeLists.txt index ea264284..10b16ae9 100644 --- a/src/systems/si-cgs/CMakeLists.txt +++ b/src/systems/si-cgs/CMakeLists.txt @@ -22,4 +22,4 @@ cmake_minimum_required(VERSION 3.15) -add_units_system(si-cgs mp-units::si) +add_units_module(si-cgs mp-units::si) diff --git a/src/systems/si-fps/CMakeLists.txt b/src/systems/si-fps/CMakeLists.txt index 96e4be9a..c311fb5e 100644 --- a/src/systems/si-fps/CMakeLists.txt +++ b/src/systems/si-fps/CMakeLists.txt @@ -22,4 +22,4 @@ cmake_minimum_required(VERSION 3.15) -add_units_system(si-fps mp-units::si) +add_units_module(si-fps mp-units::si) diff --git a/src/systems/si-iau/CMakeLists.txt b/src/systems/si-iau/CMakeLists.txt index 1af29347..ce9984a8 100644 --- a/src/systems/si-iau/CMakeLists.txt +++ b/src/systems/si-iau/CMakeLists.txt @@ -22,4 +22,4 @@ cmake_minimum_required(VERSION 3.15) -add_units_system(si-iau mp-units::si) +add_units_module(si-iau mp-units::si) diff --git a/src/systems/si-imperial/CMakeLists.txt b/src/systems/si-imperial/CMakeLists.txt index b483d0e9..f99f274b 100644 --- a/src/systems/si-imperial/CMakeLists.txt +++ b/src/systems/si-imperial/CMakeLists.txt @@ -22,4 +22,4 @@ cmake_minimum_required(VERSION 3.15) -add_units_system(si-imperial mp-units::si) +add_units_module(si-imperial mp-units::si) diff --git a/src/systems/si-international/CMakeLists.txt b/src/systems/si-international/CMakeLists.txt index e98ad8f0..e8b2716a 100644 --- a/src/systems/si-international/CMakeLists.txt +++ b/src/systems/si-international/CMakeLists.txt @@ -22,4 +22,4 @@ cmake_minimum_required(VERSION 3.15) -add_units_system(si-international mp-units::si) +add_units_module(si-international mp-units::si) diff --git a/src/systems/si-typographic/CMakeLists.txt b/src/systems/si-typographic/CMakeLists.txt index 0a0974de..10d0e4d7 100644 --- a/src/systems/si-typographic/CMakeLists.txt +++ b/src/systems/si-typographic/CMakeLists.txt @@ -22,4 +22,4 @@ cmake_minimum_required(VERSION 3.15) -add_units_system(si-typographic mp-units::si) +add_units_module(si-typographic mp-units::si) diff --git a/src/systems/si-us/CMakeLists.txt b/src/systems/si-us/CMakeLists.txt index 3c6dbe40..69caa8e8 100644 --- a/src/systems/si-us/CMakeLists.txt +++ b/src/systems/si-us/CMakeLists.txt @@ -22,4 +22,4 @@ cmake_minimum_required(VERSION 3.15) -add_units_system(si-us mp-units::si) +add_units_module(si-us mp-units::si) diff --git a/src/systems/si/CMakeLists.txt b/src/systems/si/CMakeLists.txt index 3bcd06f7..bb5098b5 100644 --- a/src/systems/si/CMakeLists.txt +++ b/src/systems/si/CMakeLists.txt @@ -22,4 +22,4 @@ cmake_minimum_required(VERSION 3.15) -add_units_system(si mp-units::isq) +add_units_module(si mp-units::isq)