Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

minor changes in headers to make tick work in my environment. I beli… #13

Open
wants to merge 1 commit into
base: master
Choose a base branch
from
Open

minor changes in headers to make tick work in my environment. I beli… #13

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
19 changes: 19 additions & 0 deletions CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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})
Copy link
Owner

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This doesn't include all the header files, and I don't like the idea of creating a target for each include directory.


# end headers in IDE
####################

7 changes: 3 additions & 4 deletions tick/builder.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,10 +8,9 @@
#ifndef TICK_GUARD_BUILDER_H
#define TICK_GUARD_BUILDER_H

#include <tick/detail/matches.h>
#include <tick/detail/pp.h>
#include <tick/integral_constant.h>

#include "detail/matches.h"
#include "detail/pp.h"
#include "integral_constant.h"
Copy link
Owner

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

The include paths should not use relative paths.


#if defined (__GNUC__) && !defined (__clang__)
# if __GNUC__ == 4 && __GNUC_MINOR__ < 7
Expand Down
2 changes: 1 addition & 1 deletion tick/detail/matches.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@
#ifndef TICK_DETAIL_GUARD_MATCHES_H
#define TICK_DETAIL_GUARD_MATCHES_H

#include <tick/placeholders.h>
#include "../placeholders.h"
#include <tuple>

namespace tick { namespace detail {
Expand Down
2 changes: 1 addition & 1 deletion tick/placeholders.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@
#ifndef TICK_GUARD_PLACEHOLDERS_H
#define TICK_GUARD_PLACEHOLDERS_H

#include <tick/integral_constant.h>
#include "integral_constant.h"

namespace tick {

Expand Down
3 changes: 2 additions & 1 deletion tick/requires.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,8 @@
#define TICK_GUARD_REQUIRES_H

#include <type_traits>
#include <tick/integral_constant.h>
//#include <tick/integral_constant.h>
#include "integral_constant.h"

namespace tick {

Expand Down
8 changes: 4 additions & 4 deletions tick/trait_check.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,10 +8,10 @@
#ifndef TICK_GUARD_TRAIT_CHECK_H
#define TICK_GUARD_TRAIT_CHECK_H

#include <tick/builder.h>
#include <tick/detail/fold.h>
#include <tick/detail/pp.h>
#include <tick/detail/set.h>
#include "builder.h"
#include "detail/fold.h"
#include "detail/pp.h"
#include "detail/set.h"

namespace tick {

Expand Down
4 changes: 2 additions & 2 deletions tick/traits.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,8 +8,8 @@
#ifndef TICK_GUARD_TRAITS_H
#define TICK_GUARD_TRAITS_H

#include <tick/builder.h>
#include <tick/requires.h>
#include "builder.h"
#include "requires.h"
#include <iterator>

namespace tick_adl {
Expand Down