Skip to content

Commit 8e0137e

Browse files
eseilereseiler
authored
Merge pull request seqan#11 from eseiler/infra/use_include
[INFRA] Use include directory
2 parents fd3f552 + 5ce7070 commit 8e0137e

19 files changed

Lines changed: 52 additions & 61 deletions

‎CMakeLists.txt‎

Lines changed: 17 additions & 24 deletions
Original file line numberDiff line numberDiff line change
@@ -10,35 +10,28 @@ project (SEQAN_STD
1010
DESCRIPTION "Implementation of several C++23/26 views"
1111
)
1212

13-
get_filename_component (SEQAN_STD_DIR_NAME "${CMAKE_CURRENT_SOURCE_DIR}" NAME)
14-
if (NOT SEQAN_STD_DIR_NAME STREQUAL "seqan-std")
15-
message (FATAL_ERROR "The directory name must be 'seqan-std'.")
16-
endif ()
17-
18-
file (REAL_PATH "${CMAKE_CURRENT_SOURCE_DIR}/.." SEQAN_STD_INCLUDE_DIR)
19-
2013
add_library (seqan-std INTERFACE)
2114
target_sources (seqan-std INTERFACE
2215
FILE_SET HEADERS
2316
TYPE HEADERS
24-
BASE_DIRS ${SEQAN_STD_INCLUDE_DIR}
17+
BASE_DIRS ${PROJECT_SOURCE_DIR}/include
2518
FILES
26-
${SEQAN_STD_INCLUDE_DIR}/seqan-std/all_view.hpp
27-
${SEQAN_STD_INCLUDE_DIR}/seqan-std/chunk_by_view.hpp
28-
${SEQAN_STD_INCLUDE_DIR}/seqan-std/chunk_view.hpp
29-
${SEQAN_STD_INCLUDE_DIR}/seqan-std/concepts.hpp
30-
${SEQAN_STD_INCLUDE_DIR}/seqan-std/detail/adaptor_base.hpp
31-
${SEQAN_STD_INCLUDE_DIR}/seqan-std/detail/adaptor_for_view_without_args.hpp
32-
${SEQAN_STD_INCLUDE_DIR}/seqan-std/detail/adaptor_from_functor.hpp
33-
${SEQAN_STD_INCLUDE_DIR}/seqan-std/detail/exposition_only.hpp
34-
${SEQAN_STD_INCLUDE_DIR}/seqan-std/detail/movable_box.hpp
35-
${SEQAN_STD_INCLUDE_DIR}/seqan-std/detail/non_propagating_cache.hpp
36-
${SEQAN_STD_INCLUDE_DIR}/seqan-std/enumerate_view.hpp
37-
${SEQAN_STD_INCLUDE_DIR}/seqan-std/join_with_view.hpp
38-
${SEQAN_STD_INCLUDE_DIR}/seqan-std/pair.hpp
39-
${SEQAN_STD_INCLUDE_DIR}/seqan-std/to.hpp
40-
${SEQAN_STD_INCLUDE_DIR}/seqan-std/tuple.hpp
41-
${SEQAN_STD_INCLUDE_DIR}/seqan-std/zip_view.hpp
19+
${PROJECT_SOURCE_DIR}/include/seqan-std/all_view.hpp
20+
${PROJECT_SOURCE_DIR}/include/seqan-std/chunk_by_view.hpp
21+
${PROJECT_SOURCE_DIR}/include/seqan-std/chunk_view.hpp
22+
${PROJECT_SOURCE_DIR}/include/seqan-std/concepts.hpp
23+
${PROJECT_SOURCE_DIR}/include/seqan-std/detail/adaptor_base.hpp
24+
${PROJECT_SOURCE_DIR}/include/seqan-std/detail/adaptor_for_view_without_args.hpp
25+
${PROJECT_SOURCE_DIR}/include/seqan-std/detail/adaptor_from_functor.hpp
26+
${PROJECT_SOURCE_DIR}/include/seqan-std/detail/exposition_only.hpp
27+
${PROJECT_SOURCE_DIR}/include/seqan-std/detail/movable_box.hpp
28+
${PROJECT_SOURCE_DIR}/include/seqan-std/detail/non_propagating_cache.hpp
29+
${PROJECT_SOURCE_DIR}/include/seqan-std/enumerate_view.hpp
30+
${PROJECT_SOURCE_DIR}/include/seqan-std/join_with_view.hpp
31+
${PROJECT_SOURCE_DIR}/include/seqan-std/pair.hpp
32+
${PROJECT_SOURCE_DIR}/include/seqan-std/to.hpp
33+
${PROJECT_SOURCE_DIR}/include/seqan-std/tuple.hpp
34+
${PROJECT_SOURCE_DIR}/include/seqan-std/zip_view.hpp
4235
)
4336
target_compile_features (seqan-std INTERFACE cxx_std_20)
4437
add_library (seqan::std ALIAS seqan-std)

all_view.hpp renamed to include/seqan-std/all_view.hpp

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -30,9 +30,9 @@ using std::ranges::views::all_t;
3030

3131
} // namespace seqan::stl::views
3232
#else
33-
# include "concepts.hpp"
34-
# include "detail/adaptor_base.hpp"
35-
# include "detail/exposition_only.hpp"
33+
# include <seqan-std/concepts.hpp>
34+
# include <seqan-std/detail/adaptor_base.hpp>
35+
# include <seqan-std/detail/exposition_only.hpp>
3636

3737
namespace seqan::stl::ranges
3838
{

chunk_by_view.hpp renamed to include/seqan-std/chunk_by_view.hpp

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -26,11 +26,11 @@ using std::ranges::views::chunk_by;
2626

2727
#else
2828

29-
# include "all_view.hpp"
30-
# include "concepts.hpp"
31-
# include "detail/adaptor_from_functor.hpp"
32-
# include "detail/movable_box.hpp"
33-
# include "detail/non_propagating_cache.hpp"
29+
# include <seqan-std/all_view.hpp>
30+
# include <seqan-std/concepts.hpp>
31+
# include <seqan-std/detail/adaptor_from_functor.hpp>
32+
# include <seqan-std/detail/movable_box.hpp>
33+
# include <seqan-std/detail/non_propagating_cache.hpp>
3434

3535
namespace seqan::stl::ranges
3636
{

chunk_view.hpp renamed to include/seqan-std/chunk_view.hpp

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -28,11 +28,11 @@ using std::ranges::views::chunk;
2828

2929
# include <algorithm>
3030

31-
# include "all_view.hpp"
32-
# include "concepts.hpp"
33-
# include "detail/adaptor_from_functor.hpp"
34-
# include "detail/exposition_only.hpp"
35-
# include "detail/non_propagating_cache.hpp"
31+
# include <seqan-std/all_view.hpp>
32+
# include <seqan-std/concepts.hpp>
33+
# include <seqan-std/detail/adaptor_from_functor.hpp>
34+
# include <seqan-std/detail/exposition_only.hpp>
35+
# include <seqan-std/detail/non_propagating_cache.hpp>
3636

3737
namespace seqan::stl::detail::chunk
3838
{

concepts.hpp renamed to include/seqan-std/concepts.hpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@ using std::ranges::viewable_range;
2121

2222
}
2323
#else
24-
# include "detail/exposition_only.hpp"
24+
# include <seqan-std/detail/exposition_only.hpp>
2525
namespace seqan::stl::ranges
2626
{
2727

detail/adaptor_base.hpp renamed to include/seqan-std/detail/adaptor_base.hpp

File renamed without changes.

detail/adaptor_for_view_without_args.hpp renamed to include/seqan-std/detail/adaptor_for_view_without_args.hpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@
1111
#ifndef SEQAN_STD_DETAIL_ADAPTOR_FOR_VIEW_WITHOUT_ARGS
1212
#define SEQAN_STD_DETAIL_ADAPTOR_FOR_VIEW_WITHOUT_ARGS
1313

14-
#include "adaptor_base.hpp"
14+
#include <seqan-std/detail/adaptor_base.hpp>
1515

1616
namespace seqan::stl::detail
1717
{

detail/adaptor_from_functor.hpp renamed to include/seqan-std/detail/adaptor_from_functor.hpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@
1111
#ifndef SEQAN_STD_DETAIL_ADAPTOR_FROM_FUNCTOR
1212
#define SEQAN_STD_DETAIL_ADAPTOR_FROM_FUNCTOR
1313

14-
#include "adaptor_base.hpp"
14+
#include <seqan-std/detail/adaptor_base.hpp>
1515

1616
namespace seqan::stl::detail
1717
{

detail/exposition_only.hpp renamed to include/seqan-std/detail/exposition_only.hpp

File renamed without changes.

detail/movable_box.hpp renamed to include/seqan-std/detail/movable_box.hpp

File renamed without changes.

0 commit comments

Comments
 (0)