Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
4 changes: 3 additions & 1 deletion .github/workflows/ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -35,6 +35,8 @@ jobs:
- 'CMakeLists.txt'
- 'modules/iris'
- 'test/CMakeLists.txt'
- 'scripts/generate_tuple_members.sh'
- 'scripts/generate_tuple_members.bat'
alloy:
- 'include/iris/alloy/**/*'
- 'test/alloy/**/*'
Expand Down Expand Up @@ -195,7 +197,7 @@ jobs:
-DCMAKE_CXX_FLAGS="${{ matrix.compiler.cxxflags }}" \
-DCMAKE_CXX_STANDARD=${{ matrix.cpp_version.number }} \
-DCMAKE_BUILD_TYPE=${{ matrix.build_type.name }} \
-DIRIS_TEST_ALLOY=${{ case(matrix.components == 'alloy' || matrix.components == 'x4', 'ON', 'OFF') }} \
-DIRIS_TEST_ALLOY=${{ case(matrix.components == 'alloy', 'ON', 'OFF') }} \
-DIRIS_TEST_X4=${{ case(matrix.components == 'x4', 'ON', 'OFF') }} \
-S .

Expand Down
2 changes: 1 addition & 1 deletion CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -102,7 +102,7 @@ if(MSVC)
"${PROJECT_SOURCE_DIR}/iris_x4.natvis"
)

target_link_libraries(iris_x4 PUBLIC Iris::Iris)
target_link_libraries(iris_x4 PUBLIC Iris::Iris Iris::Alloy)

else()
add_library(iris_x4 INTERFACE)
Expand Down
5 changes: 3 additions & 2 deletions scripts/generate_tuple_members.bat
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,8 @@ REM https://www.boost.org/LICENSE_1_0.txt
@echo off
cl /TP /std:c++23preview /Iinclude /Imodules\boost_preprocessor\include /Imodules\iris\include /P /EP /C /DIRIS_ALLOY_GENERATE_PREPROCESSED /Fiinclude\iris\alloy\detail\preprocessed\temp.hpp include\iris\alloy\detail\tuple_impl.hpp
pushd include\iris\alloy\detail\preprocessed
type tuple_impl.hpp.pre.in temp.hpp tuple_impl.hpp.post.in > tuple_impl.hpp
clang-format -i tuple_impl.hpp
type tuple_impl.hpp.pre.in temp.hpp tuple_impl.hpp.post.in > temp2.hpp
clang-format -i temp2.hpp
rename temp2.hpp tuple_impl.hpp
del temp.hpp
popd
5 changes: 3 additions & 2 deletions scripts/generate_tuple_members.sh
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,7 @@
# https://www.boost.org/LICENSE_1_0.txt
g++ -Iinclude -Imodules/boost_preprocessor/include -Imodules/iris/include -E -P -DIRIS_ALLOY_GENERATE_PREPROCESSED include/iris/alloy/detail/tuple_impl.hpp > include/iris/alloy/detail/preprocessed/temp.hpp
cd include/iris/alloy/detail/preprocessed
cat tuple_impl.hpp.pre.in temp.hpp tuple_impl.hpp.post.in > tuple_impl.hpp
clang-format -i tuple_impl.hpp
cat tuple_impl.hpp.pre.in temp.hpp tuple_impl.hpp.post.in > temp2.hpp
clang-format -i temp2.hpp
mv temp2.hpp tuple_impl.hpp
rm temp.hpp