From 8e112c1f80bb88ad3706c26e757134b6e33b5e10 Mon Sep 17 00:00:00 2001 From: BlackMATov Date: Mon, 5 Feb 2024 02:44:49 +0700 Subject: [PATCH] Revert "remove vmath from develop's vendors" This reverts commit a71069a894e44322505801619ef8abe9f1622356. --- .gitmodules | 3 +++ develop/unbench/CMakeLists.txt | 6 ++++-- develop/vendors/CMakeLists.txt | 13 +++++++++++++ develop/vendors/vmath.hpp | 1 + 4 files changed, 21 insertions(+), 2 deletions(-) create mode 160000 develop/vendors/vmath.hpp diff --git a/.gitmodules b/.gitmodules index 422b39e..6feceff 100644 --- a/.gitmodules +++ b/.gitmodules @@ -7,3 +7,6 @@ [submodule "develop/vendors/gbench"] path = develop/vendors/gbench url = https://github.com/google/benchmark +[submodule "develop/vendors/vmath.hpp"] + path = develop/vendors/vmath.hpp + url = https://github.com/BlackMATov/vmath.hpp diff --git a/develop/unbench/CMakeLists.txt b/develop/unbench/CMakeLists.txt index d6bf4d8..9111d6c 100644 --- a/develop/unbench/CMakeLists.txt +++ b/develop/unbench/CMakeLists.txt @@ -9,12 +9,14 @@ add_executable(${PROJECT_NAME}.singles EXCLUDE_FROM_ALL ${UNBENCH_SOURCES}) target_link_libraries(${PROJECT_NAME} PRIVATE meta.hpp::meta.hpp meta.hpp::setup_targets - meta.hpp.vendors::gbench) + meta.hpp.vendors::gbench + meta.hpp.vendors::vmath.hpp) target_link_libraries(${PROJECT_NAME}.singles PRIVATE meta.hpp::singles meta.hpp::setup_targets - meta.hpp.vendors::gbench) + meta.hpp.vendors::gbench + meta.hpp.vendors::vmath.hpp) target_compile_definitions(${PROJECT_NAME} PRIVATE META_HPP_HEADERS_BUILD) diff --git a/develop/vendors/CMakeLists.txt b/develop/vendors/CMakeLists.txt index dbfb8e8..559408e 100644 --- a/develop/vendors/CMakeLists.txt +++ b/develop/vendors/CMakeLists.txt @@ -56,3 +56,16 @@ target_compile_definitions(${PROJECT_NAME}.gbench target_link_libraries(${PROJECT_NAME}.gbench PRIVATE $<$:shlwapi>) + +# +# vmath.hpp +# + +add_library(${PROJECT_NAME}.vmath.hpp INTERFACE EXCLUDE_FROM_ALL) +add_library(${PROJECT_NAME}::vmath.hpp ALIAS ${PROJECT_NAME}.vmath.hpp) + +target_compile_features(${PROJECT_NAME}.vmath.hpp + INTERFACE cxx_std_20) + +target_include_directories(${PROJECT_NAME}.vmath.hpp SYSTEM + INTERFACE vmath.hpp/headers) diff --git a/develop/vendors/vmath.hpp b/develop/vendors/vmath.hpp new file mode 160000 index 0000000..ed47c53 --- /dev/null +++ b/develop/vendors/vmath.hpp @@ -0,0 +1 @@ +Subproject commit ed47c535f70c6a05a3bd5a65a90400c3843dfefc