From 7d37e656cbc42bdaf51cc3ce15667df65d81028e Mon Sep 17 00:00:00 2001 From: Mateusz Pusz Date: Wed, 14 Jun 2023 21:15:27 +0300 Subject: [PATCH] chore: merge issues fixed --- src/CMakeLists.txt | 5 +---- src/core/include/mp-units/customization_points.h | 4 ---- 2 files changed, 1 insertion(+), 8 deletions(-) diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt index cc27e30d..bb738399 100644 --- a/src/CMakeLists.txt +++ b/src/CMakeLists.txt @@ -28,9 +28,6 @@ set(projectPrefix UNITS_) option(${projectPrefix}AS_SYSTEM_HEADERS "Exports library as system headers" OFF) message(STATUS "${projectPrefix}AS_SYSTEM_HEADERS: ${${projectPrefix}AS_SYSTEM_HEADERS}") -option(${projectPrefix}BUILD_LA "Build code depending on the linear algebra library" ON) -message(STATUS "${projectPrefix}BUILD_LA: ${${projectPrefix}BUILD_LA}") - list(APPEND CMAKE_MODULE_PATH "${PROJECT_SOURCE_DIR}/cmake") include(AddUnitsModule) @@ -64,5 +61,5 @@ write_basic_package_version_file(mp-unitsConfigVersion.cmake COMPATIBILITY SameM install(EXPORT mp-unitsTargets DESTINATION ${CMAKE_INSTALL_LIBDIR}/cmake/mp-units NAMESPACE mp-units::) install(FILES mp-unitsConfig.cmake ${CMAKE_CURRENT_BINARY_DIR}/mp-unitsConfigVersion.cmake - DESTINATION ${CMAKE_INSTALL_LIBDIR}/cmake/mp-units + DESTINATION ${CMAKE_INSTALL_LIBDIR}/cmake/mp-units ) diff --git a/src/core/include/mp-units/customization_points.h b/src/core/include/mp-units/customization_points.h index 192d2943..af099781 100644 --- a/src/core/include/mp-units/customization_points.h +++ b/src/core/include/mp-units/customization_points.h @@ -86,10 +86,6 @@ inline constexpr bool is_vector = false; template inline constexpr bool is_tensor = false; -template - requires requires { typename T::element_type; } -inline constexpr bool treat_as_floating_point = treat_as_floating_point; - /** * @brief A type trait that defines zero, one, min, and max for a representation type *