Remove submodule, use the system Sprout
This commit is contained in:
parent
fa5eed2948
commit
7fb56e65ff
5 changed files with 14 additions and 15 deletions
3
.gitmodules
vendored
3
.gitmodules
vendored
|
@ -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
|
||||
|
|
|
@ -5,6 +5,8 @@ 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)
|
||||
|
@ -30,15 +32,16 @@ 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
|
||||
)
|
||||
|
||||
add_subdirectory(lib/sprout)
|
||||
|
||||
if (BUILD_TESTING)
|
||||
add_subdirectory(test/unit)
|
||||
endif()
|
||||
|
|
|
@ -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>
|
||||
|
|
|
@ -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>
|
||||
|
|
|
@ -1 +0,0 @@
|
|||
Subproject commit 6b5addba9face0a6403e66e7db2aa94d87387f61
|
Loading…
Reference in a new issue