Skip to content

Update flag forking approach to use split config.hpp and config_generated.hpp files #60

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

Merged
ednolan merged 1 commit into from
May 2, 2026
Merged

Update flag forking approach to use split config.hpp and config_generated.hpp files #60

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.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 3 additions & 3 deletions CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -49,8 +49,8 @@ if(
endif()

configure_file(
"${PROJECT_SOURCE_DIR}/include/beman/iterator_interface/config.hpp.in"
"${PROJECT_BINARY_DIR}/include/beman/iterator_interface/config.hpp"
"${PROJECT_SOURCE_DIR}/include/beman/iterator_interface/config_generated.hpp.in"
"${PROJECT_BINARY_DIR}/include/beman/iterator_interface/config_generated.hpp"
@ONLY
)

Expand All @@ -67,7 +67,7 @@ target_sources(
FILE_SET HEADERS
BASE_DIRS
"${CMAKE_CURRENT_SOURCE_DIR}/include"
"${PROJECT_BINARY_DIR}/include"
"${CMAKE_CURRENT_BINARY_DIR}/include"
)

set_target_properties(
Expand Down
3 changes: 2 additions & 1 deletion include/beman/iterator_interface/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,10 +5,11 @@ target_sources(
PUBLIC
FILE_SET HEADERS
FILES
config.hpp
iterator_interface.hpp
iterator_interface_access.hpp
detail/stl_interfaces/config.hpp
detail/stl_interfaces/fwd.hpp
detail/stl_interfaces/iterator_interface.hpp
"${PROJECT_BINARY_DIR}/include/beman/iterator_interface/config.hpp"
"${PROJECT_BINARY_DIR}/include/beman/iterator_interface/config_generated.hpp"
)
15 changes: 15 additions & 0 deletions include/beman/iterator_interface/config.hpp
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,15 @@
#ifndef BEMAN_ITERATOR_INTERFACE_CONFIG_HPP
#define BEMAN_ITERATOR_INTERFACE_CONFIG_HPP

#if !defined(__has_include) || __has_include(<beman/iterator_interface/config_generated.hpp>)
#include <beman/iterator_interface/config_generated.hpp>
#else
#include <version>
#if defined(__cpp_explicit_this_parameter) && __cpp_explicit_this_parameter >= 202110L
#define BEMAN_ITERATOR_INTERFACE_USE_DEDUCING_THIS() 1
#else
#define BEMAN_ITERATOR_INTERFACE_USE_DEDUCING_THIS() 0
#endif
#endif

#endif
4 changes: 2 additions & 2 deletions ...de/beman/iterator_interface/config.hpp.in → ...terator_interface/config_generated.hpp.in
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
// include/beman/iterator_interface/config.hpp.in -*-C++-*-
// SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception

#ifndef BEMAN_ITERATOR_INTERFACE_CONFIG_HPP
#define BEMAN_ITERATOR_INTERFACE_CONFIG_HPP
#ifndef BEMAN_ITERATOR_INTERFACE_CONFIG_GENERATED_HPP
#define BEMAN_ITERATOR_INTERFACE_CONFIG_GENERATED_HPP

#cmakedefine01 BEMAN_ITERATOR_INTERFACE_USE_DEDUCING_THIS()

Expand Down