From 26dd0ee8580ddfb6056674b4955706d8924b69aa Mon Sep 17 00:00:00 2001 From: Andrey Astafyev Date: Wed, 27 Nov 2019 16:20:50 +0300 Subject: [PATCH] =?UTF-8?q?=D0=A4=D1=83=D0=BD=D0=BA=D1=86=D0=B8=D0=B8=20?= =?UTF-8?q?=D0=B4=D0=BB=D1=8F=20=D0=BE=D0=BF=D1=80=D0=B5=D0=B4=D0=B5=D0=BB?= =?UTF-8?q?=D0=B5=D0=BD=D0=B8=D1=8F=20=D1=80=D0=B0=D0=B2=D0=B5=D0=BD=D1=81?= =?UTF-8?q?=D1=82=D0=B2=D0=B0=20=D1=83=20=D1=87=D0=B8=D1=81=D0=B5=D0=BB=20?= =?UTF-8?q?=D1=81=20=D0=BF=D0=BB=D0=B0=D0=B2=D0=B0=D1=8E=D1=89=D0=B5=D0=B9?= =?UTF-8?q?=20=D1=82=D0=BE=D1=87=D0=BA=D0=BE=D0=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- cmake/generators | 2 +- src/myx/math/CMakeLists.txt | 10 +++++++++- src/myx/math/all.hpp | 4 ++++ 3 files changed, 14 insertions(+), 2 deletions(-) diff --git a/cmake/generators b/cmake/generators index c04395e..9952d86 160000 --- a/cmake/generators +++ b/cmake/generators @@ -1 +1 @@ -Subproject commit c04395ef98c3973caf41a67de8263018d82c6c5e +Subproject commit 9952d8626933a1003f90395a90946934dd254f48 diff --git a/src/myx/math/CMakeLists.txt b/src/myx/math/CMakeLists.txt index 009223c..bd7ed3e 100644 --- a/src/myx/math/CMakeLists.txt +++ b/src/myx/math/CMakeLists.txt @@ -3,13 +3,22 @@ set(current_target math) # Список файлов исходных текстов set(current_target_sources + ${CMAKE_CURRENT_SOURCE_DIR}/almost_equal_relative.cpp + ${CMAKE_CURRENT_SOURCE_DIR}/almost_equal_relative_and_abs.cpp + ${CMAKE_CURRENT_SOURCE_DIR}/almost_equal_ulps.cpp + ${CMAKE_CURRENT_SOURCE_DIR}/almost_equal_ulps_and_abs.cpp ${CMAKE_CURRENT_SOURCE_DIR}/constants.cpp ) # Список заголовочных файлов (используется для установки) set(current_target_headers ${CMAKE_CURRENT_SOURCE_DIR}/all.hpp + ${CMAKE_CURRENT_SOURCE_DIR}/almost_equal_relative.hpp + ${CMAKE_CURRENT_SOURCE_DIR}/almost_equal_relative_and_abs.hpp + ${CMAKE_CURRENT_SOURCE_DIR}/almost_equal_ulps.hpp + ${CMAKE_CURRENT_SOURCE_DIR}/almost_equal_ulps_and_abs.hpp ${CMAKE_CURRENT_SOURCE_DIR}/constants.hpp + ${CMAKE_CURRENT_SOURCE_DIR}/float_cmp_types.hpp ${CMAKE_CURRENT_SOURCE_DIR}/functions.hpp ${CMAKE_CURRENT_SOURCE_DIR}/radar.hpp ${CMAKE_CURRENT_SOURCE_DIR}/units.hpp @@ -54,4 +63,3 @@ install(FILES ${current_target_headers} COMPONENT headers DESTINATION ${CMAKE_INSTALL_INCLUDEDIR}/${PROJECT_NAME}/${current_target}) install(FILES ${CMAKE_BINARY_DIR}/${current_target}.pc DESTINATION ${CMAKE_INSTALL_LIBDIR}/pkgconfig) - diff --git a/src/myx/math/all.hpp b/src/myx/math/all.hpp index 0efc6e5..43c4213 100644 --- a/src/myx/math/all.hpp +++ b/src/myx/math/all.hpp @@ -2,3 +2,7 @@ #include #include #include +#include +#include +#include +#include