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

cmcstl2 dependency changed to range-v3 0.9.1

Browse Source
This commit is contained in:
Mateusz Pusz
2019-09-18 11:01:20 -06:00
parent 422c078cb2
commit b6fc65633d
6 changed files with 31 additions and 19 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
README.md
View File

@ -56,6 +56,9 @@ NOTE: This library as of now compiles correctly only with gcc-9.1 and newer.
## Release notes ## Release notes
- 0.3.1 Sep 18, 2019
- cmcstl2 dependency changed to range-v3 0.9.1
- 0.3.0 Sep 16, 2019 (CppCon 2019 design) - 0.3.0 Sep 16, 2019 (CppCon 2019 design)
- The design as described on CppCon 2019 talk - The design as described on CppCon 2019 talk
- Applied the feedback from the Cologne evening session - Applied the feedback from the Cologne evening session

4
conanfile.py
View File

@ -45,7 +45,7 @@ class UnitsConan(ConanFile):
exports = ["LICENSE.md"] exports = ["LICENSE.md"]
settings = "os", "compiler", "build_type", "arch" settings = "os", "compiler", "build_type", "arch"
requires = ( requires = (
"cmcstl2/2019.09.09@mpusz/stable" "range-v3/0.9.1@ericniebler/stable"
) )
scm = { scm = {
"type": "git", "type": "git",
@ -82,6 +82,8 @@ class UnitsConan(ConanFile):
def package_info(self): def package_info(self):
self.cpp_info.includedirs = ['include'] self.cpp_info.includedirs = ['include']
if self.settings.compiler == "gcc":
self.cpp_info.cxxflags = ["-fconcepts"]
def package_id(self): def package_id(self):
self.info.settings.clear() self.info.settings.clear()

13
src/CMakeLists.txt
View File

@ -53,17 +53,20 @@ add_library(units INTERFACE)
target_compile_features(units INTERFACE cxx_std_20) target_compile_features(units INTERFACE cxx_std_20)
target_link_libraries(units target_link_libraries(units
INTERFACE INTERFACE
CONAN_PKG::cmcstl2 CONAN_PKG::range-v3
) )
target_include_directories(units target_include_directories(units
INTERFACE INTERFACE
$<BUILD_INTERFACE:${CMAKE_CURRENT_SOURCE_DIR}/include> $<BUILD_INTERFACE:${CMAKE_CURRENT_SOURCE_DIR}/include>
$<INSTALL_INTERFACE:include> $<INSTALL_INTERFACE:include>
) )
target_compile_options(units if(CMAKE_COMPILER_IS_GNUCC OR CMAKE_COMPILER_IS_GNUCXX)
INTERFACE target_compile_options(units
-Wno-literal-suffix INTERFACE
) -Wno-literal-suffix
-fconcepts
)
endif()
add_library(mp::units ALIAS units) add_library(mp::units ALIAS units)
# installation info # installation info

12
src/include/units/bits/hacks.h
View File

@ -22,7 +22,7 @@
#pragma once #pragma once
#include <experimental/ranges/concepts> #include <concepts/concepts.hpp>
#ifdef NDEBUG #ifdef NDEBUG
#define Expects(cond) (void)(cond); #define Expects(cond) (void)(cond);
@ -34,10 +34,10 @@
namespace std { namespace std {
// concepts // concepts
using experimental::ranges::same_as; using concepts::same_as;
using experimental::ranges::derived_from; using concepts::derived_from;
using experimental::ranges::regular; using concepts::regular;
using experimental::ranges::totally_ordered; using concepts::totally_ordered;
using experimental::ranges::convertible_to; using concepts::convertible_to;
} }

6
test/metabench/CMakeLists.txt
View File

@ -26,7 +26,11 @@ function(add_metabench_test target name erb_path range)
target_compile_features(${target} PUBLIC cxx_std_20) target_compile_features(${target} PUBLIC cxx_std_20)
target_link_libraries(${target} target_link_libraries(${target}
PUBLIC PUBLIC
CONAN_PKG::cmcstl2 CONAN_PKG::range-v3
)
target_compile_options(${target}
PUBLIC
-fconcepts
) )
endfunction() endfunction()

12
test/metabench/make_dimension/hacks.h
View File

@ -22,7 +22,7 @@
#pragma once #pragma once
#include <experimental/ranges/concepts> #include <concepts/concepts.hpp>
#ifdef NDEBUG #ifdef NDEBUG
#define Expects(cond) (void)(cond); #define Expects(cond) (void)(cond);
@ -34,10 +34,10 @@
namespace std { namespace std {
// concepts // concepts
using experimental::ranges::same_as; using concepts::same_as;
using experimental::ranges::derived_from; using concepts::derived_from;
using experimental::ranges::regular; using concepts::regular;
using experimental::ranges::totally_ordered; using concepts::totally_ordered;
using experimental::ranges::convertible_to; using concepts::convertible_to;
} }