From bafe717a315f07a1269b5af4d01dd3b3272e6733 Mon Sep 17 00:00:00 2001 From: Robert Ramey Date: Sun, 6 Aug 2017 09:45:09 -0700 Subject: [PATCH] minor changes in headers to make tick work in my environment. I believe they are of general usage. --- CMakeLists.txt | 19 +++++++++++++++++++ tick/builder.h | 7 +++---- tick/detail/matches.h | 2 +- tick/placeholders.h | 2 +- tick/requires.h | 3 ++- tick/trait_check.h | 8 ++++---- tick/traits.h | 4 ++-- 7 files changed, 32 insertions(+), 13 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index ed3321a..665e2ea 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -71,3 +71,22 @@ add_test_executable(set) add_test_executable(tag) add_test_executable(trait_check) add_test_executable(traits) + +#################### +# add include headers to IDE + +file(GLOB tick_include + RELATIVE "${CMAKE_CURRENT_SOURCE_DIR}" + "${CMAKE_CURRENT_SOURCE_DIR}/tick/*.h" +) +add_custom_target(tick_include SOURCES ${tick_include}) + +file(GLOB tick_include + RELATIVE "${CMAKE_CURRENT_SOURCE_DIR}" + "${CMAKE_CURRENT_SOURCE_DIR}/tick/detail/*.h" +) +add_custom_target(tick_include_detail SOURCES ${tick_include}) + +# end headers in IDE +#################### + diff --git a/tick/builder.h b/tick/builder.h index 9ce4ad9..5b24e2f 100644 --- a/tick/builder.h +++ b/tick/builder.h @@ -8,10 +8,9 @@ #ifndef TICK_GUARD_BUILDER_H #define TICK_GUARD_BUILDER_H -#include -#include -#include - +#include "detail/matches.h" +#include "detail/pp.h" +#include "integral_constant.h" #if defined (__GNUC__) && !defined (__clang__) # if __GNUC__ == 4 && __GNUC_MINOR__ < 7 diff --git a/tick/detail/matches.h b/tick/detail/matches.h index 1c77cc5..86ca0d9 100644 --- a/tick/detail/matches.h +++ b/tick/detail/matches.h @@ -8,7 +8,7 @@ #ifndef TICK_DETAIL_GUARD_MATCHES_H #define TICK_DETAIL_GUARD_MATCHES_H -#include +#include "../placeholders.h" #include namespace tick { namespace detail { diff --git a/tick/placeholders.h b/tick/placeholders.h index 3504020..cbe0a7a 100644 --- a/tick/placeholders.h +++ b/tick/placeholders.h @@ -8,7 +8,7 @@ #ifndef TICK_GUARD_PLACEHOLDERS_H #define TICK_GUARD_PLACEHOLDERS_H -#include +#include "integral_constant.h" namespace tick { diff --git a/tick/requires.h b/tick/requires.h index 7604bc4..6d99ec5 100644 --- a/tick/requires.h +++ b/tick/requires.h @@ -9,7 +9,8 @@ #define TICK_GUARD_REQUIRES_H #include -#include +//#include +#include "integral_constant.h" namespace tick { diff --git a/tick/trait_check.h b/tick/trait_check.h index 0b17013..7efc267 100644 --- a/tick/trait_check.h +++ b/tick/trait_check.h @@ -8,10 +8,10 @@ #ifndef TICK_GUARD_TRAIT_CHECK_H #define TICK_GUARD_TRAIT_CHECK_H -#include -#include -#include -#include +#include "builder.h" +#include "detail/fold.h" +#include "detail/pp.h" +#include "detail/set.h" namespace tick { diff --git a/tick/traits.h b/tick/traits.h index 0ac39e1..59350b4 100644 --- a/tick/traits.h +++ b/tick/traits.h @@ -8,8 +8,8 @@ #ifndef TICK_GUARD_TRAITS_H #define TICK_GUARD_TRAITS_H -#include -#include +#include "builder.h" +#include "requires.h" #include namespace tick_adl {