BlackMATov/meta.hpp
1
0
Fork 0
mirror of https://github.com/BlackMATov/meta.hpp.git synced 2025-12-15 11:52:08 +07:00
Code Issues Packages Projects Releases Wiki Activity

more msvc toolsets, little test fixes

Browse Source
This commit is contained in:
BlackMATov
2022-10-30 01:02:39 +07:00
parent 97d9f94ac0
commit d2c67cc9ab
2 changed files with 56 additions and 47 deletions
Download Patch File Download Diff File Expand all files Collapse all files

97
CMakePresets.json
View File

@@ -69,14 +69,14 @@
} }
}, },
{ {
"name": "windows-x86", "name": "windows-x86-msvc2019",
"inherits": "windows-base", "inherits": "windows-base",
"architecture": { "architecture": {
"value": "x86", "value": "x86",
"strategy": "external" "strategy": "external"
}, },
"toolset": { "toolset": {
"value": "host=x64", "value": "v142,host=x64",
"strategy": "external" "strategy": "external"
}, },
"cacheVariables": { "cacheVariables": {
@@ -85,14 +85,46 @@
} }
}, },
{ {
"name": "windows-x64", "name": "windows-x64-msvc2019",
"inherits": "windows-base", "inherits": "windows-base",
"architecture": { "architecture": {
"value": "x64", "value": "x64",
"strategy": "external" "strategy": "external"
}, },
"toolset": { "toolset": {
"value": "host=x64", "value": "v142,host=x64",
"strategy": "external"
},
"cacheVariables": {
"CMAKE_C_COMPILER": "cl",
"CMAKE_CXX_COMPILER": "cl"
}
},
{
"name": "windows-x86-msvc2022",
"inherits": "windows-base",
"architecture": {
"value": "x86",
"strategy": "external"
},
"toolset": {
"value": "v143,host=x64",
"strategy": "external"
},
"cacheVariables": {
"CMAKE_C_COMPILER": "cl",
"CMAKE_CXX_COMPILER": "cl"
}
},
{
"name": "windows-x64-msvc2022",
"inherits": "windows-base",
"architecture": {
"value": "x64",
"strategy": "external"
},
"toolset": {
"value": "v143,host=x64",
"strategy": "external" "strategy": "external"
}, },
"cacheVariables": { "cacheVariables": {
@@ -124,67 +156,44 @@
"configurePreset": "macos-x64" "configurePreset": "macos-x64"
}, },
{ {
"name": "windows-x86-debug", "name": "windows-x86-msvc2019-debug",
"configuration": "Debug", "configuration": "Debug",
"configurePreset": "windows-x86" "configurePreset": "windows-x86-msvc2019"
}, },
{ {
"name": "windows-x86-release", "name": "windows-x86-msvc2019-release",
"configuration": "Release", "configuration": "Release",
"configurePreset": "windows-x86" "configurePreset": "windows-x86-msvc2019"
}, },
{ {
"name": "windows-x64-debug", "name": "windows-x64-msvc2019-debug",
"configuration": "Debug", "configuration": "Debug",
"configurePreset": "windows-x64" "configurePreset": "windows-x64-msvc2019"
}, },
{ {
"name": "windows-x64-release", "name": "windows-x64-msvc2019-release",
"configuration": "Release", "configuration": "Release",
"configurePreset": "windows-x64" "configurePreset": "windows-x64-msvc2019"
} },
],
"testPresets": [
{ {
"name": "macos-arm64-debug", "name": "windows-x86-msvc2022-debug",
"configuration": "Debug", "configuration": "Debug",
"configurePreset": "macos-arm64-san" "configurePreset": "windows-x86-msvc2022"
}, },
{ {
"name": "macos-arm64-release", "name": "windows-x86-msvc2022-release",
"configuration": "Release", "configuration": "Release",
"configurePreset": "macos-arm64" "configurePreset": "windows-x86-msvc2022"
}, },
{ {
"name": "macos-x64-debug", "name": "windows-x64-msvc2022-debug",
"configuration": "Debug", "configuration": "Debug",
"configurePreset": "macos-x64-san" "configurePreset": "windows-x64-msvc2022"
}, },
{ {
"name": "macos-x64-release", "name": "windows-x64-msvc2022-release",
"configuration": "Release", "configuration": "Release",
"configurePreset": "macos-x64" "configurePreset": "windows-x64-msvc2022"
},
{
"name": "windows-x86-debug",
"configuration": "Debug",
"configurePreset": "windows-x86"
},
{
"name": "windows-x86-release",
"configuration": "Release",
"configurePreset": "windows-x86"
},
{
"name": "windows-x64-debug",
"configuration": "Debug",
"configurePreset": "windows-x64"
},
{
"name": "windows-x64-release",
"configuration": "Release",
"configurePreset": "windows-x64"
} }
] ]
} }

6
untests/meta_utilities/value_tests.cpp
View File

@@ -504,15 +504,15 @@ TEST_CASE("meta/meta_utilities/value") {
CHECK(ivec2::copy_constructor_counter == 0); CHECK(ivec2::copy_constructor_counter == 0);
[[maybe_unused]] meta::uvalue vv1{*vp}; [[maybe_unused]] meta::uvalue vv1{*vp};
CHECK((ivec2::move_constructor_counter == 0 || ivec2::move_constructor_counter == 2)); CHECK((ivec2::move_constructor_counter == 0 || ivec2::move_constructor_counter == 1 || ivec2::move_constructor_counter == 2));
CHECK(ivec2::copy_constructor_counter == 1); CHECK(ivec2::copy_constructor_counter == 1);
[[maybe_unused]] meta::uvalue vv2{*std::move(vp)}; [[maybe_unused]] meta::uvalue vv2{*std::move(vp)};
CHECK((ivec2::move_constructor_counter == 0 || ivec2::move_constructor_counter == 4)); CHECK((ivec2::move_constructor_counter == 0 || ivec2::move_constructor_counter == 2 || ivec2::move_constructor_counter == 4));
CHECK(ivec2::copy_constructor_counter == 2); CHECK(ivec2::copy_constructor_counter == 2);
[[maybe_unused]] meta::uvalue vv3{*std::as_const(vp)}; [[maybe_unused]] meta::uvalue vv3{*std::as_const(vp)};
CHECK((ivec2::move_constructor_counter == 0 || ivec2::move_constructor_counter == 6)); CHECK((ivec2::move_constructor_counter == 0 || ivec2::move_constructor_counter == 3 || ivec2::move_constructor_counter == 6));
CHECK(ivec2::copy_constructor_counter == 3); CHECK(ivec2::copy_constructor_counter == 3);
} }
{ {