diff --git a/CMakeLists.txt b/CMakeLists.txt index b1b63e8..aaf0079 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -1,11 +1,16 @@ 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) 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) @@ -32,6 +37,13 @@ target_compile_definitions(${PROJECT_NAME} INTERFACE SPROUT_USE_TEMPLATE_ALIASES ) +add_subdirectory(lib/sprout) + if (BUILD_TESTING) add_subdirectory(test/unit) endif() + +install( + DIRECTORY include/duckhandy + DESTINATION include +) diff --git a/lib/Catch2 b/lib/Catch2 index c9de7dd..89f5f84 160000 --- a/lib/Catch2 +++ b/lib/Catch2 @@ -1 +1 @@ -Subproject commit c9de7dd12d2971c63f9d32ce5459eb98f2fec13d +Subproject commit 89f5f8435176aad44624442b7f1e874a513bee67 diff --git a/lib/sprout b/lib/sprout index 8274f34..6b5addb 160000 --- a/lib/sprout +++ b/lib/sprout @@ -1 +1 @@ -Subproject commit 8274f34db498b02bff12277bac5416ea72e018cd +Subproject commit 6b5addba9face0a6403e66e7db2aa94d87387f61