Merge branch 'master' of github.com:mpusz/units

This commit is contained in:
Mateusz Pusz
2020-09-08 13:23:36 +02:00
5 changed files with 25 additions and 41 deletions
+2
View File
@@ -95,6 +95,7 @@ add_custom_command(OUTPUT "${SPHINX_INDEX_FILE}"
"${CMAKE_CURRENT_SOURCE_DIR}/examples/linear_algebra.rst"
"${CMAKE_CURRENT_SOURCE_DIR}/examples/measurement.rst"
"${CMAKE_CURRENT_SOURCE_DIR}/examples/total_energy.rst"
"${CMAKE_CURRENT_SOURCE_DIR}/examples/unknown_dimension.rst"
"${CMAKE_CURRENT_SOURCE_DIR}/faq.rst"
@@ -104,6 +105,7 @@ add_custom_command(OUTPUT "${SPHINX_INDEX_FILE}"
"${CMAKE_CURRENT_SOURCE_DIR}/framework/conversions_and_casting.rst"
"${CMAKE_CURRENT_SOURCE_DIR}/framework/dimensions.rst"
"${CMAKE_CURRENT_SOURCE_DIR}/framework/quantities.rst"
"${CMAKE_CURRENT_SOURCE_DIR}/framework/quantity_points.rst"
"${CMAKE_CURRENT_SOURCE_DIR}/framework/text_output.rst"
"${CMAKE_CURRENT_SOURCE_DIR}/framework/units.rst"
+4 -4
View File
@@ -51,8 +51,8 @@ naming and we came up with ``q_`` prefix which results in a creation of
quantity of a provided unit.
Why do we use UDLs reserved for the C++ standard (no `_` prefix)?
^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
Why do we use UDLs reserved for the C++ standard (no ``_`` prefix)?
^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
This library is meant to become a part of the C++ Standard Library at some point
in the future. We decided to work with the target interface to get implementation
@@ -63,8 +63,8 @@ with literals already existing in the language in our initial approach
This approach has some side effects though. We had to disable some compiler warnings
to make it work:
- `/wd4455` on MSVC,
- `-Wno-literal-suffix` on other compilers.
- ``/wd4455`` on MSVC,
- ``-Wno-literal-suffix`` on other compilers.
Text formatting
+3 -3
View File
@@ -261,7 +261,7 @@ differences:
`the project's README file <https://github.com/mpusz/units/blob/master/README.md>`_ or on
`the project's Bintray <https://bintray.com/mpusz/conan-mpusz/mp-units%3Ampusz>`_.
3. Force Conan to check for updated recipes `-u` and to build outdated packages `-b outdated`:
3. Force Conan to check for updated recipes ``-u`` and to build outdated packages ``-b outdated``:
.. code-block:: shell
@@ -279,7 +279,7 @@ enough to handle simple dependencies and configurations. If your project setup i
may prefer to use ``cmake`` generator. In such a case the above procedures should be updated as
follows:
1. Specify `cmake` generator in your Conan configuration file:
1. Specify ``cmake`` generator in your Conan configuration file:
.. code-block:: ini
:caption: conanfile.txt
@@ -317,7 +317,7 @@ in **mp-units** repository, you should:
1. Add remotes of additional Conan dependencies.
2. Use the *CMakeLists.txt* from the top-level directory.
3. Obtain Python dependencies.
4. Run Conan with :envvar:`CONAN_RUN_TESTS` = ``True``.
4. Run Conan with `CONAN_RUN_TESTS`_ = ``True``.
.. code-block:: shell