King_DuckZ/duckhandy
1
0
Fork 0
Code Issues Pull requests Releases Wiki Activity

Merge branch 'master' into scapegoat_tree

Browse source
This commit is contained in:
King_DuckZ 2020-05-05 02:01:44 +02:00
commit 5f9526a19b
6 changed files with 26 additions and 15 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
.gitmodules vendored
View file

@ -1,6 +1,3 @@
[submodule "lib/sprout"]
path = lib/sprout
url = https://github.com/bolero-MURAKAMI/Sprout.git
[submodule "lib/Catch2"]
path = lib/Catch2
url = https://github.com/catchorg/Catch2.git

19
CMakeLists.txt
View file

@ -1,11 +1,18 @@
cmake_minimum_required(VERSION 3.8 FATAL_ERROR)
project(duckhandy)
project(duckhandy VERSION 0.1.0)
list (APPEND CMAKE_MODULE_PATH ${CMAKE_CURRENT_SOURCE_DIR}/cmake/Modules)
include(shared_git_project)
include(CTest)
find_package(Sprout REQUIRED)
set(DUCKHANDY_SOURCE_DIR "${CMAKE_CURRENT_SOURCE_DIR}")
if (BUILD_TESTING)
set(BUILD_TESTS CACHE BOOL ON)
else()
set(BUILD_TESTS CACHE BOOL OFF)
endif()
add_library(${PROJECT_NAME} INTERFACE)
@ -25,8 +32,11 @@ target_compile_features(${PROJECT_NAME}
target_include_directories(${PROJECT_NAME}
INTERFACE ${CMAKE_CURRENT_SOURCE_DIR}/include
INTERFACE ${CMAKE_CURRENT_SOURCE_DIR}/lib/sprout
)
target_include_directories(${PROJECT_NAME} SYSTEM
INTERFACE ${SPROUT_INCLUDE_DIRS}
)
target_compile_definitions(${PROJECT_NAME}
INTERFACE SPROUT_NO_CXX11_NUMERIC_LIMITS
INTERFACE SPROUT_USE_TEMPLATE_ALIASES
@ -35,3 +45,8 @@ target_compile_definitions(${PROJECT_NAME}
if (BUILD_TESTING)
add_subdirectory(test/unit)
endif()
install(
DIRECTORY include/duckhandy
DESTINATION include
)

6
include/duckhandy/implem/int_conv.hpp
View file

@ -19,9 +19,9 @@
#define id4754A95F12BE4ADEA65642A056A51907
#include "duckhandy/implem/reversed_sized_array_bt.hpp"
#include "sprout/math/log10.hpp"
#include "sprout/math/abs.hpp"
#include "sprout/math/ceil.hpp"
#include <sprout/math/log10.hpp>
#include <sprout/math/abs.hpp>
#include <sprout/math/ceil.hpp>
#include <cstddef>
#include <array>
#include <limits>

10
include/duckhandy/lexical_cast.hpp
View file

@ -22,11 +22,11 @@
#include "sequence_bt.hpp"
#include "MaxSizedArray.hpp"
#include "has_method.hpp"
#include "sprout/math/log10.hpp"
#include "sprout/math/log2.hpp"
#include "sprout/math/pow.hpp"
#include "sprout/math/abs.hpp"
#include "sprout/limits.hpp"
#include <sprout/math/log10.hpp>
#include <sprout/math/log2.hpp>
#include <sprout/math/pow.hpp>
#include <sprout/math/abs.hpp>
#include <sprout/limits.hpp>
#include <type_traits>
#include <utility>
#include <cstdint>

2
lib/Catch2

@ -1 +1 @@
Subproject commit c9de7dd12d2971c63f9d32ce5459eb98f2fec13d
Subproject commit 89f5f8435176aad44624442b7f1e874a513bee67

1
lib/sprout

@ -1 +0,0 @@
Subproject commit 8274f34db498b02bff12277bac5416ea72e018cd