diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 0a4f89c24..e3c0ccb3c 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -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/**/*' @@ -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 . diff --git a/CMakeLists.txt b/CMakeLists.txt index d3832de5a..6d8c73cac 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -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) diff --git a/scripts/generate_tuple_members.bat b/scripts/generate_tuple_members.bat index ade91ab3e..d7858494d 100644 --- a/scripts/generate_tuple_members.bat +++ b/scripts/generate_tuple_members.bat @@ -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 diff --git a/scripts/generate_tuple_members.sh b/scripts/generate_tuple_members.sh index 5a26a2729..bba7fe528 100755 --- a/scripts/generate_tuple_members.sh +++ b/scripts/generate_tuple_members.sh @@ -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