From 8e2f22767fa350a9dc2cc55a6c32a78f2aa76a4a Mon Sep 17 00:00:00 2001 From: khizmax Date: Mon, 14 Nov 2016 18:39:55 +0300 Subject: [PATCH] Splitted some unit test to reduce memory consumption under MSVC --- projects/Win/build-msbuild.cmd | 2 +- projects/Win/vc14/cds.sln | 174 ++++-- .../Win/vc14/gtest-striped-map-boost.vcxproj | 252 ++++++++ ...xproj => gtest-striped-map-cuckoo.vcxproj} | 10 +- .../Win/vc14/gtest-striped-map-std.vcxproj | 250 ++++++++ .../vc14/gtest-striped-map.vcxproj.filters | 56 -- .../Win/vc14/gtest-striped-set-boost.vcxproj | 263 +++++++++ ...xproj => gtest-striped-set-cuckoo.vcxproj} | 557 +++++++++--------- .../Win/vc14/gtest-striped-set-std.vcxproj | 250 ++++++++ .../vc14/gtest-striped-set.vcxproj.filters | 95 --- projects/Win/vc14/gtest-tree-bronson.vcxproj | 259 ++++++++ ...-tree.vcxproj => gtest-tree-ellen.vcxproj} | 14 +- ...lters => gtest-tree-ellen.vcxproj.filters} | 39 -- 13 files changed, 1666 insertions(+), 555 deletions(-) create mode 100644 projects/Win/vc14/gtest-striped-map-boost.vcxproj rename projects/Win/vc14/{gtest-striped-map.vcxproj => gtest-striped-map-cuckoo.vcxproj} (96%) create mode 100644 projects/Win/vc14/gtest-striped-map-std.vcxproj delete mode 100644 projects/Win/vc14/gtest-striped-map.vcxproj.filters create mode 100644 projects/Win/vc14/gtest-striped-set-boost.vcxproj rename projects/Win/vc14/{gtest-striped-set.vcxproj => gtest-striped-set-cuckoo.vcxproj} (90%) create mode 100644 projects/Win/vc14/gtest-striped-set-std.vcxproj delete mode 100644 projects/Win/vc14/gtest-striped-set.vcxproj.filters create mode 100644 projects/Win/vc14/gtest-tree-bronson.vcxproj rename projects/Win/vc14/{gtest-tree.vcxproj => gtest-tree-ellen.vcxproj} (95%) rename projects/Win/vc14/{gtest-tree.vcxproj.filters => gtest-tree-ellen.vcxproj.filters} (76%) diff --git a/projects/Win/build-msbuild.cmd b/projects/Win/build-msbuild.cmd index 08f2674c..1d015168 100644 --- a/projects/Win/build-msbuild.cmd +++ b/projects/Win/build-msbuild.cmd @@ -10,5 +10,5 @@ set MSBUILD=msbuild :make for %%A in (x64 Win32) do ( %MSBUILD% %vcXX%\cds.sln /t:Clean /p:Configuration=%cfg% /p:Platform=%%A %3 %4 %5 %6 %7 %8 %9 - %MSBUILD% %vcXX%\cds.sln /t:Build /p:Configuration=%cfg% /p:Platform=%%A /fl /flp:LogFile=%vcXX%_%%A.log;Encoding=UTF-8;Verbosity=minimal /v:minimal /maxcpucount %3 %4 %5 %6 %7 %8 %9 + %MSBUILD% %vcXX%\cds.sln /t:Build /p:Configuration=%cfg% /p:Platform=%%A /fl /flp:LogFile=%vcXX%_%%A_%cfg%.log;Encoding=UTF-8;Verbosity=minimal /v:minimal /maxcpucount %3 %4 %5 %6 %7 %8 %9 ) diff --git a/projects/Win/vc14/cds.sln b/projects/Win/vc14/cds.sln index fbadfc31..3e90b27a 100644 --- a/projects/Win/vc14/cds.sln +++ b/projects/Win/vc14/cds.sln @@ -72,21 +72,6 @@ Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "stress-pqueue", "stress-pqu {408FE9BC-44F0-4E6A-89FA-D6F952584239} = {408FE9BC-44F0-4E6A-89FA-D6F952584239} EndProjectSection EndProject -Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "gtest-striped-set", "gtest-striped-set.vcxproj", "{648021D3-6E18-4B94-88B8-F6A59609E210}" - ProjectSection(ProjectDependencies) = postProject - {408FE9BC-44F0-4E6A-89FA-D6F952584239} = {408FE9BC-44F0-4E6A-89FA-D6F952584239} - EndProjectSection -EndProject -Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "gtest-striped-map", "gtest-striped-map.vcxproj", "{00FD5CB8-E1A4-40CA-B613-30A06A75622B}" - ProjectSection(ProjectDependencies) = postProject - {408FE9BC-44F0-4E6A-89FA-D6F952584239} = {408FE9BC-44F0-4E6A-89FA-D6F952584239} - EndProjectSection -EndProject -Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "gtest-tree", "gtest-tree.vcxproj", "{2ABD6A2E-BEA7-4C8C-982B-A609F83D2DCB}" - ProjectSection(ProjectDependencies) = postProject - {408FE9BC-44F0-4E6A-89FA-D6F952584239} = {408FE9BC-44F0-4E6A-89FA-D6F952584239} - EndProjectSection -EndProject Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "gtest-misc", "gtest-misc.vcxproj", "{FA22E700-1AE5-4D7B-B9F1-0A919FF7FF06}" ProjectSection(ProjectDependencies) = postProject {408FE9BC-44F0-4E6A-89FA-D6F952584239} = {408FE9BC-44F0-4E6A-89FA-D6F952584239} @@ -279,6 +264,22 @@ Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "gtest-iset-split-lazy", "gt EndProject Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "gtest-iset-split-michael", "gtest-iset-split-michael.vcxproj", "{60B84B21-741E-45F5-86FB-A2ECBD05782E}" EndProject +Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "gtest-striped-map-boost", "gtest-striped-map-boost.vcxproj", "{32E3E2E1-1953-44FD-AAE2-19BD8D030CAB}" +EndProject +Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "gtest-striped-map-cuckoo", "gtest-striped-map-cuckoo.vcxproj", "{B032E27A-D7C4-437C-AC10-D235C20130F8}" +EndProject +Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "gtest-striped-map-std", "gtest-striped-map-std.vcxproj", "{7D43117B-CB6A-44D2-A79B-6E035CD8FA04}" +EndProject +Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "gtest-striped-set-boost", "gtest-striped-set-boost.vcxproj", "{F7A98219-FA54-4CEA-9813-5873A6676D3C}" +EndProject +Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "gtest-striped-set-cuckoo", "gtest-striped-set-cuckoo.vcxproj", "{E6C84E07-A02C-4F91-B759-6CA4730F4534}" +EndProject +Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "gtest-striped-set-std", "gtest-striped-set-std.vcxproj", "{BC6BCA1F-3850-4571-ADE2-BB11C2B68807}" +EndProject +Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "gtest-tree-bronson", "gtest-tree-bronson.vcxproj", "{27AB018B-953E-4632-B6A9-A4E9782A81BA}" +EndProject +Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "gtest-tree-ellen", "gtest-tree-ellen.vcxproj", "{93F1FE35-2EF4-4193-B8A2-54988F61F3B8}" +EndProject Global GlobalSection(SolutionConfigurationPlatforms) = preSolution Debug|Win32 = Debug|Win32 @@ -397,42 +398,6 @@ Global {51AC349E-B365-4FCF-8778-17A1534E4584}.Release|Win32.Build.0 = Release|Win32 {51AC349E-B365-4FCF-8778-17A1534E4584}.Release|x64.ActiveCfg = Release|x64 {51AC349E-B365-4FCF-8778-17A1534E4584}.Release|x64.Build.0 = Release|x64 - {648021D3-6E18-4B94-88B8-F6A59609E210}.Debug|Win32.ActiveCfg = Debug|Win32 - {648021D3-6E18-4B94-88B8-F6A59609E210}.Debug|Win32.Build.0 = Debug|Win32 - {648021D3-6E18-4B94-88B8-F6A59609E210}.Debug|x64.ActiveCfg = Debug|x64 - {648021D3-6E18-4B94-88B8-F6A59609E210}.Debug|x64.Build.0 = Debug|x64 - {648021D3-6E18-4B94-88B8-F6A59609E210}.DebugVLD|Win32.ActiveCfg = DebugVLD|Win32 - {648021D3-6E18-4B94-88B8-F6A59609E210}.DebugVLD|Win32.Build.0 = DebugVLD|Win32 - {648021D3-6E18-4B94-88B8-F6A59609E210}.DebugVLD|x64.ActiveCfg = DebugVLD|x64 - {648021D3-6E18-4B94-88B8-F6A59609E210}.DebugVLD|x64.Build.0 = DebugVLD|x64 - {648021D3-6E18-4B94-88B8-F6A59609E210}.Release|Win32.ActiveCfg = Release|Win32 - {648021D3-6E18-4B94-88B8-F6A59609E210}.Release|Win32.Build.0 = Release|Win32 - {648021D3-6E18-4B94-88B8-F6A59609E210}.Release|x64.ActiveCfg = Release|x64 - {648021D3-6E18-4B94-88B8-F6A59609E210}.Release|x64.Build.0 = Release|x64 - {00FD5CB8-E1A4-40CA-B613-30A06A75622B}.Debug|Win32.ActiveCfg = Debug|Win32 - {00FD5CB8-E1A4-40CA-B613-30A06A75622B}.Debug|Win32.Build.0 = Debug|Win32 - {00FD5CB8-E1A4-40CA-B613-30A06A75622B}.Debug|x64.ActiveCfg = Debug|x64 - {00FD5CB8-E1A4-40CA-B613-30A06A75622B}.Debug|x64.Build.0 = Debug|x64 - {00FD5CB8-E1A4-40CA-B613-30A06A75622B}.DebugVLD|Win32.ActiveCfg = DebugVLD|Win32 - {00FD5CB8-E1A4-40CA-B613-30A06A75622B}.DebugVLD|Win32.Build.0 = DebugVLD|Win32 - {00FD5CB8-E1A4-40CA-B613-30A06A75622B}.DebugVLD|x64.ActiveCfg = DebugVLD|x64 - {00FD5CB8-E1A4-40CA-B613-30A06A75622B}.DebugVLD|x64.Build.0 = DebugVLD|x64 - {00FD5CB8-E1A4-40CA-B613-30A06A75622B}.Release|Win32.ActiveCfg = Release|Win32 - {00FD5CB8-E1A4-40CA-B613-30A06A75622B}.Release|Win32.Build.0 = Release|Win32 - {00FD5CB8-E1A4-40CA-B613-30A06A75622B}.Release|x64.ActiveCfg = Release|x64 - {00FD5CB8-E1A4-40CA-B613-30A06A75622B}.Release|x64.Build.0 = Release|x64 - {2ABD6A2E-BEA7-4C8C-982B-A609F83D2DCB}.Debug|Win32.ActiveCfg = Debug|Win32 - {2ABD6A2E-BEA7-4C8C-982B-A609F83D2DCB}.Debug|Win32.Build.0 = Debug|Win32 - {2ABD6A2E-BEA7-4C8C-982B-A609F83D2DCB}.Debug|x64.ActiveCfg = Debug|x64 - {2ABD6A2E-BEA7-4C8C-982B-A609F83D2DCB}.Debug|x64.Build.0 = Debug|x64 - {2ABD6A2E-BEA7-4C8C-982B-A609F83D2DCB}.DebugVLD|Win32.ActiveCfg = DebugVLD|Win32 - {2ABD6A2E-BEA7-4C8C-982B-A609F83D2DCB}.DebugVLD|Win32.Build.0 = DebugVLD|Win32 - {2ABD6A2E-BEA7-4C8C-982B-A609F83D2DCB}.DebugVLD|x64.ActiveCfg = DebugVLD|x64 - {2ABD6A2E-BEA7-4C8C-982B-A609F83D2DCB}.DebugVLD|x64.Build.0 = DebugVLD|x64 - {2ABD6A2E-BEA7-4C8C-982B-A609F83D2DCB}.Release|Win32.ActiveCfg = Release|Win32 - {2ABD6A2E-BEA7-4C8C-982B-A609F83D2DCB}.Release|Win32.Build.0 = Release|Win32 - {2ABD6A2E-BEA7-4C8C-982B-A609F83D2DCB}.Release|x64.ActiveCfg = Release|x64 - {2ABD6A2E-BEA7-4C8C-982B-A609F83D2DCB}.Release|x64.Build.0 = Release|x64 {FA22E700-1AE5-4D7B-B9F1-0A919FF7FF06}.Debug|Win32.ActiveCfg = Debug|Win32 {FA22E700-1AE5-4D7B-B9F1-0A919FF7FF06}.Debug|Win32.Build.0 = Debug|Win32 {FA22E700-1AE5-4D7B-B9F1-0A919FF7FF06}.Debug|x64.ActiveCfg = Debug|x64 @@ -985,6 +950,102 @@ Global {60B84B21-741E-45F5-86FB-A2ECBD05782E}.Release|Win32.Build.0 = Release|Win32 {60B84B21-741E-45F5-86FB-A2ECBD05782E}.Release|x64.ActiveCfg = Release|x64 {60B84B21-741E-45F5-86FB-A2ECBD05782E}.Release|x64.Build.0 = Release|x64 + {32E3E2E1-1953-44FD-AAE2-19BD8D030CAB}.Debug|Win32.ActiveCfg = Debug|Win32 + {32E3E2E1-1953-44FD-AAE2-19BD8D030CAB}.Debug|Win32.Build.0 = Debug|Win32 + {32E3E2E1-1953-44FD-AAE2-19BD8D030CAB}.Debug|x64.ActiveCfg = Debug|x64 + {32E3E2E1-1953-44FD-AAE2-19BD8D030CAB}.Debug|x64.Build.0 = Debug|x64 + {32E3E2E1-1953-44FD-AAE2-19BD8D030CAB}.DebugVLD|Win32.ActiveCfg = DebugVLD|Win32 + {32E3E2E1-1953-44FD-AAE2-19BD8D030CAB}.DebugVLD|Win32.Build.0 = DebugVLD|Win32 + {32E3E2E1-1953-44FD-AAE2-19BD8D030CAB}.DebugVLD|x64.ActiveCfg = DebugVLD|x64 + {32E3E2E1-1953-44FD-AAE2-19BD8D030CAB}.DebugVLD|x64.Build.0 = DebugVLD|x64 + {32E3E2E1-1953-44FD-AAE2-19BD8D030CAB}.Release|Win32.ActiveCfg = Release|Win32 + {32E3E2E1-1953-44FD-AAE2-19BD8D030CAB}.Release|Win32.Build.0 = Release|Win32 + {32E3E2E1-1953-44FD-AAE2-19BD8D030CAB}.Release|x64.ActiveCfg = Release|x64 + {32E3E2E1-1953-44FD-AAE2-19BD8D030CAB}.Release|x64.Build.0 = Release|x64 + {B032E27A-D7C4-437C-AC10-D235C20130F8}.Debug|Win32.ActiveCfg = Debug|Win32 + {B032E27A-D7C4-437C-AC10-D235C20130F8}.Debug|Win32.Build.0 = Debug|Win32 + {B032E27A-D7C4-437C-AC10-D235C20130F8}.Debug|x64.ActiveCfg = Debug|x64 + {B032E27A-D7C4-437C-AC10-D235C20130F8}.Debug|x64.Build.0 = Debug|x64 + {B032E27A-D7C4-437C-AC10-D235C20130F8}.DebugVLD|Win32.ActiveCfg = DebugVLD|Win32 + {B032E27A-D7C4-437C-AC10-D235C20130F8}.DebugVLD|Win32.Build.0 = DebugVLD|Win32 + {B032E27A-D7C4-437C-AC10-D235C20130F8}.DebugVLD|x64.ActiveCfg = DebugVLD|x64 + {B032E27A-D7C4-437C-AC10-D235C20130F8}.DebugVLD|x64.Build.0 = DebugVLD|x64 + {B032E27A-D7C4-437C-AC10-D235C20130F8}.Release|Win32.ActiveCfg = Release|Win32 + {B032E27A-D7C4-437C-AC10-D235C20130F8}.Release|Win32.Build.0 = Release|Win32 + {B032E27A-D7C4-437C-AC10-D235C20130F8}.Release|x64.ActiveCfg = Release|x64 + {B032E27A-D7C4-437C-AC10-D235C20130F8}.Release|x64.Build.0 = Release|x64 + {7D43117B-CB6A-44D2-A79B-6E035CD8FA04}.Debug|Win32.ActiveCfg = Debug|Win32 + {7D43117B-CB6A-44D2-A79B-6E035CD8FA04}.Debug|Win32.Build.0 = Debug|Win32 + {7D43117B-CB6A-44D2-A79B-6E035CD8FA04}.Debug|x64.ActiveCfg = Debug|x64 + {7D43117B-CB6A-44D2-A79B-6E035CD8FA04}.Debug|x64.Build.0 = Debug|x64 + {7D43117B-CB6A-44D2-A79B-6E035CD8FA04}.DebugVLD|Win32.ActiveCfg = DebugVLD|Win32 + {7D43117B-CB6A-44D2-A79B-6E035CD8FA04}.DebugVLD|Win32.Build.0 = DebugVLD|Win32 + {7D43117B-CB6A-44D2-A79B-6E035CD8FA04}.DebugVLD|x64.ActiveCfg = DebugVLD|x64 + {7D43117B-CB6A-44D2-A79B-6E035CD8FA04}.DebugVLD|x64.Build.0 = DebugVLD|x64 + {7D43117B-CB6A-44D2-A79B-6E035CD8FA04}.Release|Win32.ActiveCfg = Release|Win32 + {7D43117B-CB6A-44D2-A79B-6E035CD8FA04}.Release|Win32.Build.0 = Release|Win32 + {7D43117B-CB6A-44D2-A79B-6E035CD8FA04}.Release|x64.ActiveCfg = Release|x64 + {7D43117B-CB6A-44D2-A79B-6E035CD8FA04}.Release|x64.Build.0 = Release|x64 + {F7A98219-FA54-4CEA-9813-5873A6676D3C}.Debug|Win32.ActiveCfg = Debug|Win32 + {F7A98219-FA54-4CEA-9813-5873A6676D3C}.Debug|Win32.Build.0 = Debug|Win32 + {F7A98219-FA54-4CEA-9813-5873A6676D3C}.Debug|x64.ActiveCfg = Debug|x64 + {F7A98219-FA54-4CEA-9813-5873A6676D3C}.Debug|x64.Build.0 = Debug|x64 + {F7A98219-FA54-4CEA-9813-5873A6676D3C}.DebugVLD|Win32.ActiveCfg = DebugVLD|Win32 + {F7A98219-FA54-4CEA-9813-5873A6676D3C}.DebugVLD|Win32.Build.0 = DebugVLD|Win32 + {F7A98219-FA54-4CEA-9813-5873A6676D3C}.DebugVLD|x64.ActiveCfg = DebugVLD|x64 + {F7A98219-FA54-4CEA-9813-5873A6676D3C}.DebugVLD|x64.Build.0 = DebugVLD|x64 + {F7A98219-FA54-4CEA-9813-5873A6676D3C}.Release|Win32.ActiveCfg = Release|Win32 + {F7A98219-FA54-4CEA-9813-5873A6676D3C}.Release|Win32.Build.0 = Release|Win32 + {F7A98219-FA54-4CEA-9813-5873A6676D3C}.Release|x64.ActiveCfg = Release|x64 + {F7A98219-FA54-4CEA-9813-5873A6676D3C}.Release|x64.Build.0 = Release|x64 + {E6C84E07-A02C-4F91-B759-6CA4730F4534}.Debug|Win32.ActiveCfg = Debug|Win32 + {E6C84E07-A02C-4F91-B759-6CA4730F4534}.Debug|Win32.Build.0 = Debug|Win32 + {E6C84E07-A02C-4F91-B759-6CA4730F4534}.Debug|x64.ActiveCfg = Debug|x64 + {E6C84E07-A02C-4F91-B759-6CA4730F4534}.Debug|x64.Build.0 = Debug|x64 + {E6C84E07-A02C-4F91-B759-6CA4730F4534}.DebugVLD|Win32.ActiveCfg = DebugVLD|Win32 + {E6C84E07-A02C-4F91-B759-6CA4730F4534}.DebugVLD|Win32.Build.0 = DebugVLD|Win32 + {E6C84E07-A02C-4F91-B759-6CA4730F4534}.DebugVLD|x64.ActiveCfg = DebugVLD|x64 + {E6C84E07-A02C-4F91-B759-6CA4730F4534}.DebugVLD|x64.Build.0 = DebugVLD|x64 + {E6C84E07-A02C-4F91-B759-6CA4730F4534}.Release|Win32.ActiveCfg = Release|Win32 + {E6C84E07-A02C-4F91-B759-6CA4730F4534}.Release|Win32.Build.0 = Release|Win32 + {E6C84E07-A02C-4F91-B759-6CA4730F4534}.Release|x64.ActiveCfg = Release|x64 + {E6C84E07-A02C-4F91-B759-6CA4730F4534}.Release|x64.Build.0 = Release|x64 + {BC6BCA1F-3850-4571-ADE2-BB11C2B68807}.Debug|Win32.ActiveCfg = Debug|Win32 + {BC6BCA1F-3850-4571-ADE2-BB11C2B68807}.Debug|Win32.Build.0 = Debug|Win32 + {BC6BCA1F-3850-4571-ADE2-BB11C2B68807}.Debug|x64.ActiveCfg = Debug|x64 + {BC6BCA1F-3850-4571-ADE2-BB11C2B68807}.Debug|x64.Build.0 = Debug|x64 + {BC6BCA1F-3850-4571-ADE2-BB11C2B68807}.DebugVLD|Win32.ActiveCfg = DebugVLD|Win32 + {BC6BCA1F-3850-4571-ADE2-BB11C2B68807}.DebugVLD|Win32.Build.0 = DebugVLD|Win32 + {BC6BCA1F-3850-4571-ADE2-BB11C2B68807}.DebugVLD|x64.ActiveCfg = DebugVLD|x64 + {BC6BCA1F-3850-4571-ADE2-BB11C2B68807}.DebugVLD|x64.Build.0 = DebugVLD|x64 + {BC6BCA1F-3850-4571-ADE2-BB11C2B68807}.Release|Win32.ActiveCfg = Release|Win32 + {BC6BCA1F-3850-4571-ADE2-BB11C2B68807}.Release|Win32.Build.0 = Release|Win32 + {BC6BCA1F-3850-4571-ADE2-BB11C2B68807}.Release|x64.ActiveCfg = Release|x64 + {BC6BCA1F-3850-4571-ADE2-BB11C2B68807}.Release|x64.Build.0 = Release|x64 + {27AB018B-953E-4632-B6A9-A4E9782A81BA}.Debug|Win32.ActiveCfg = Debug|Win32 + {27AB018B-953E-4632-B6A9-A4E9782A81BA}.Debug|Win32.Build.0 = Debug|Win32 + {27AB018B-953E-4632-B6A9-A4E9782A81BA}.Debug|x64.ActiveCfg = Debug|x64 + {27AB018B-953E-4632-B6A9-A4E9782A81BA}.Debug|x64.Build.0 = Debug|x64 + {27AB018B-953E-4632-B6A9-A4E9782A81BA}.DebugVLD|Win32.ActiveCfg = DebugVLD|Win32 + {27AB018B-953E-4632-B6A9-A4E9782A81BA}.DebugVLD|Win32.Build.0 = DebugVLD|Win32 + {27AB018B-953E-4632-B6A9-A4E9782A81BA}.DebugVLD|x64.ActiveCfg = DebugVLD|x64 + {27AB018B-953E-4632-B6A9-A4E9782A81BA}.DebugVLD|x64.Build.0 = DebugVLD|x64 + {27AB018B-953E-4632-B6A9-A4E9782A81BA}.Release|Win32.ActiveCfg = Release|Win32 + {27AB018B-953E-4632-B6A9-A4E9782A81BA}.Release|Win32.Build.0 = Release|Win32 + {27AB018B-953E-4632-B6A9-A4E9782A81BA}.Release|x64.ActiveCfg = Release|x64 + {27AB018B-953E-4632-B6A9-A4E9782A81BA}.Release|x64.Build.0 = Release|x64 + {93F1FE35-2EF4-4193-B8A2-54988F61F3B8}.Debug|Win32.ActiveCfg = Debug|Win32 + {93F1FE35-2EF4-4193-B8A2-54988F61F3B8}.Debug|Win32.Build.0 = Debug|Win32 + {93F1FE35-2EF4-4193-B8A2-54988F61F3B8}.Debug|x64.ActiveCfg = Debug|x64 + {93F1FE35-2EF4-4193-B8A2-54988F61F3B8}.Debug|x64.Build.0 = Debug|x64 + {93F1FE35-2EF4-4193-B8A2-54988F61F3B8}.DebugVLD|Win32.ActiveCfg = DebugVLD|Win32 + {93F1FE35-2EF4-4193-B8A2-54988F61F3B8}.DebugVLD|Win32.Build.0 = DebugVLD|Win32 + {93F1FE35-2EF4-4193-B8A2-54988F61F3B8}.DebugVLD|x64.ActiveCfg = DebugVLD|x64 + {93F1FE35-2EF4-4193-B8A2-54988F61F3B8}.DebugVLD|x64.Build.0 = DebugVLD|x64 + {93F1FE35-2EF4-4193-B8A2-54988F61F3B8}.Release|Win32.ActiveCfg = Release|Win32 + {93F1FE35-2EF4-4193-B8A2-54988F61F3B8}.Release|Win32.Build.0 = Release|Win32 + {93F1FE35-2EF4-4193-B8A2-54988F61F3B8}.Release|x64.ActiveCfg = Release|x64 + {93F1FE35-2EF4-4193-B8A2-54988F61F3B8}.Release|x64.Build.0 = Release|x64 EndGlobalSection GlobalSection(SolutionProperties) = preSolution HideSolutionNode = FALSE @@ -998,9 +1059,6 @@ Global {5E1C3684-9463-4A98-BAFC-9BD51F179BB6} = {10E1FAF2-904D-405E-8AB5-6878A1B03346} {50B2EC4B-A118-4E7B-ABC7-2EA8B685A58C} = {10E1FAF2-904D-405E-8AB5-6878A1B03346} {51AC349E-B365-4FCF-8778-17A1534E4584} = {10E1FAF2-904D-405E-8AB5-6878A1B03346} - {648021D3-6E18-4B94-88B8-F6A59609E210} = {810490B7-31E5-49AE-8455-CAF99A9658B6} - {00FD5CB8-E1A4-40CA-B613-30A06A75622B} = {810490B7-31E5-49AE-8455-CAF99A9658B6} - {2ABD6A2E-BEA7-4C8C-982B-A609F83D2DCB} = {810490B7-31E5-49AE-8455-CAF99A9658B6} {FA22E700-1AE5-4D7B-B9F1-0A919FF7FF06} = {810490B7-31E5-49AE-8455-CAF99A9658B6} {0D83E8C7-97D1-4BA1-928A-6846E7089652} = {10E1FAF2-904D-405E-8AB5-6878A1B03346} {8202D428-1E08-4744-B372-6B2E83A9928E} = {0D83E8C7-97D1-4BA1-928A-6846E7089652} @@ -1051,6 +1109,14 @@ Global {ACA14BAB-40E5-4507-B9CA-CF62503D8781} = {810490B7-31E5-49AE-8455-CAF99A9658B6} {25B31807-E27E-4644-8CB4-4B7C32E47B0E} = {810490B7-31E5-49AE-8455-CAF99A9658B6} {60B84B21-741E-45F5-86FB-A2ECBD05782E} = {810490B7-31E5-49AE-8455-CAF99A9658B6} + {32E3E2E1-1953-44FD-AAE2-19BD8D030CAB} = {810490B7-31E5-49AE-8455-CAF99A9658B6} + {B032E27A-D7C4-437C-AC10-D235C20130F8} = {810490B7-31E5-49AE-8455-CAF99A9658B6} + {7D43117B-CB6A-44D2-A79B-6E035CD8FA04} = {810490B7-31E5-49AE-8455-CAF99A9658B6} + {F7A98219-FA54-4CEA-9813-5873A6676D3C} = {810490B7-31E5-49AE-8455-CAF99A9658B6} + {E6C84E07-A02C-4F91-B759-6CA4730F4534} = {810490B7-31E5-49AE-8455-CAF99A9658B6} + {BC6BCA1F-3850-4571-ADE2-BB11C2B68807} = {810490B7-31E5-49AE-8455-CAF99A9658B6} + {27AB018B-953E-4632-B6A9-A4E9782A81BA} = {810490B7-31E5-49AE-8455-CAF99A9658B6} + {93F1FE35-2EF4-4193-B8A2-54988F61F3B8} = {810490B7-31E5-49AE-8455-CAF99A9658B6} EndGlobalSection GlobalSection(DPCodeReviewSolutionGUID) = preSolution DPCodeReviewSolutionGUID = {00000000-0000-0000-0000-000000000000} diff --git a/projects/Win/vc14/gtest-striped-map-boost.vcxproj b/projects/Win/vc14/gtest-striped-map-boost.vcxproj new file mode 100644 index 00000000..8d2abced --- /dev/null +++ b/projects/Win/vc14/gtest-striped-map-boost.vcxproj @@ -0,0 +1,252 @@ + + + + + DebugVLD + Win32 + + + DebugVLD + x64 + + + Debug + Win32 + + + Release + Win32 + + + Debug + x64 + + + Release + x64 + + + + + + + + + + + + + + + + + {32E3E2E1-1953-44FD-AAE2-19BD8D030CAB} + Win32Proj + striped-map + 8.1 + + + + Application + true + v140 + Unicode + + + Application + true + v140 + Unicode + + + Application + false + v140 + true + Unicode + + + Application + true + v140 + Unicode + + + Application + true + v140 + Unicode + + + Application + false + v140 + true + Unicode + + + + + + + + + + + + + + + + + + + + + + + + + + + true + $(SolutionDir)..\..\..\bin\vc.$(PlatformToolset)\$(Platform)\ + $(SolutionDir)..\..\..\obj\vc.$(PlatformToolset)\$(Platform)\$(ProjectName)\$(Configuration)\ + $(ProjectName)_d + + + true + $(SolutionDir)..\..\..\bin\vc.$(PlatformToolset)\$(Platform)\ + $(SolutionDir)..\..\..\obj\vc.$(PlatformToolset)\$(Platform)\$(ProjectName)\$(Configuration)\ + $(ProjectName)_d + + + true + $(SolutionDir)..\..\..\bin\vc.$(PlatformToolset)\$(Platform)\ + $(SolutionDir)..\..\..\obj\vc.$(PlatformToolset)\$(Platform)\$(ProjectName)\$(Configuration)\ + $(ProjectName)_d + + + true + $(SolutionDir)..\..\..\bin\vc.$(PlatformToolset)\$(Platform)\ + $(SolutionDir)..\..\..\obj\vc.$(PlatformToolset)\$(Platform)\$(ProjectName)\$(Configuration)\ + $(ProjectName)_d + + + false + $(SolutionDir)..\..\..\bin\vc.$(PlatformToolset)\$(Platform)-release\ + $(SolutionDir)..\..\..\obj\vc.$(PlatformToolset)\$(Platform)\$(ProjectName)\$(Configuration)\ + + + false + $(SolutionDir)..\..\..\bin\vc.$(PlatformToolset)\$(Platform)-release\ + $(SolutionDir)..\..\..\obj\vc.$(PlatformToolset)\$(Platform)\$(ProjectName)\$(Configuration)\ + + + + NotUsing + Level3 + Disabled + _ENABLE_ATOMIC_ALIGNMENT_FIX;CDSUNIT_ENABLE_BOOST_CONTAINER;WIN32;_DEBUG;_CONSOLE;%(PreprocessorDefinitions) + $(SolutionDir)..\..\..;$(GTEST_ROOT)/include;$(SolutionDir)..\..\..\test\include;$(BOOST_PATH);%(AdditionalIncludeDirectories) + /bigobj %(AdditionalOptions) + + + Console + DebugFastLink + $(GTEST_LIB32);$(GTEST_ROOT)/lib/x86;$(BOOST_PATH)/stage32/lib;$(BOOST_PATH)/stage/lib;$(BOOST_PATH)/bin;%(AdditionalLibraryDirectories);$(OutDir) + gtestd.lib;%(AdditionalDependencies) + + + + + NotUsing + Level3 + Disabled + _ENABLE_ATOMIC_ALIGNMENT_FIX;CDSUNIT_ENABLE_BOOST_CONTAINER;WIN32;_DEBUG;_CONSOLE;%(PreprocessorDefinitions) + $(SolutionDir)..\..\..;$(GTEST_ROOT)/include;$(SolutionDir)..\..\..\test\include;$(BOOST_PATH);%(AdditionalIncludeDirectories) + /bigobj %(AdditionalOptions) + + + Console + DebugFastLink + $(GTEST_LIB32);$(GTEST_ROOT)/lib/x86;$(BOOST_PATH)/stage32/lib;$(BOOST_PATH)/stage/lib;$(BOOST_PATH)/bin;%(AdditionalLibraryDirectories);$(OutDir) + gtestd.lib;%(AdditionalDependencies) + + + + + NotUsing + Level3 + Disabled + _ENABLE_ATOMIC_ALIGNMENT_FIX;CDSUNIT_ENABLE_BOOST_CONTAINER;_DEBUG;_CONSOLE;%(PreprocessorDefinitions) + $(SolutionDir)..\..\..;$(GTEST_ROOT)/include;$(SolutionDir)..\..\..\test\include;$(BOOST_PATH);%(AdditionalIncludeDirectories) + /bigobj %(AdditionalOptions) + + + Console + DebugFastLink + $(GTEST_LIB64);$(GTEST_ROOT)/lib/x64;$(BOOST_PATH)/stage64/lib;$(BOOST_PATH)/bin;%(AdditionalLibraryDirectories);$(OutDir) + gtestd.lib;%(AdditionalDependencies) + + + + + NotUsing + Level3 + Disabled + _ENABLE_ATOMIC_ALIGNMENT_FIX;CDSUNIT_ENABLE_BOOST_CONTAINER;_DEBUG;_CONSOLE;%(PreprocessorDefinitions) + $(SolutionDir)..\..\..;$(GTEST_ROOT)/include;$(SolutionDir)..\..\..\test\include;$(BOOST_PATH);%(AdditionalIncludeDirectories) + /bigobj %(AdditionalOptions) + + + Console + DebugFastLink + $(GTEST_LIB64);$(GTEST_ROOT)/lib/x64;$(BOOST_PATH)/stage64/lib;$(BOOST_PATH)/bin;%(AdditionalLibraryDirectories);$(OutDir) + gtestd.lib;%(AdditionalDependencies) + + + + + Level3 + NotUsing + MaxSpeed + true + true + _ENABLE_ATOMIC_ALIGNMENT_FIX;CDSUNIT_ENABLE_BOOST_CONTAINER;WIN32;NDEBUG;_CONSOLE;%(PreprocessorDefinitions) + $(SolutionDir)..\..\..;$(GTEST_ROOT)/include;$(SolutionDir)..\..\..\test\include;$(BOOST_PATH);%(AdditionalIncludeDirectories) + /bigobj %(AdditionalOptions) + + + Console + true + true + true + $(GTEST_LIB32);$(GTEST_ROOT)/lib/x86;$(BOOST_PATH)/stage32/lib;$(BOOST_PATH)/stage/lib;$(BOOST_PATH)/bin;%(AdditionalLibraryDirectories);$(OutDir) + gtest.lib;%(AdditionalDependencies) + + + + + Level3 + NotUsing + MaxSpeed + true + true + _ENABLE_ATOMIC_ALIGNMENT_FIX;CDSUNIT_ENABLE_BOOST_CONTAINER;NDEBUG;_CONSOLE;%(PreprocessorDefinitions) + $(SolutionDir)..\..\..;$(GTEST_ROOT)/include;$(SolutionDir)..\..\..\test\include;$(BOOST_PATH);%(AdditionalIncludeDirectories) + /bigobj %(AdditionalOptions) + + + Console + true + true + true + $(GTEST_LIB64);$(GTEST_ROOT)/lib/x64;$(BOOST_PATH)/stage64/lib;$(BOOST_PATH)/bin;%(AdditionalLibraryDirectories);$(OutDir) + gtest.lib;%(AdditionalDependencies) + + + + + + \ No newline at end of file diff --git a/projects/Win/vc14/gtest-striped-map.vcxproj b/projects/Win/vc14/gtest-striped-map-cuckoo.vcxproj similarity index 96% rename from projects/Win/vc14/gtest-striped-map.vcxproj rename to projects/Win/vc14/gtest-striped-map-cuckoo.vcxproj index ab47b69d..f84c54bd 100644 --- a/projects/Win/vc14/gtest-striped-map.vcxproj +++ b/projects/Win/vc14/gtest-striped-map-cuckoo.vcxproj @@ -42,14 +42,6 @@ CDSUNIT_ENABLE_BOOST_CONTAINER;_SCL_SECURE_NO_WARNINGS;_DEBUG;_CONSOLE;%(PreprocessorDefinitions) CDSUNIT_ENABLE_BOOST_CONTAINER;_SCL_SECURE_NO_WARNINGS;NDEBUG;_CONSOLE;%(PreprocessorDefinitions) - - - - - - - - @@ -57,7 +49,7 @@ - {00FD5CB8-E1A4-40CA-B613-30A06A75622B} + {B032E27A-D7C4-437C-AC10-D235C20130F8} Win32Proj striped-map 8.1 diff --git a/projects/Win/vc14/gtest-striped-map-std.vcxproj b/projects/Win/vc14/gtest-striped-map-std.vcxproj new file mode 100644 index 00000000..d3615adb --- /dev/null +++ b/projects/Win/vc14/gtest-striped-map-std.vcxproj @@ -0,0 +1,250 @@ + + + + + DebugVLD + Win32 + + + DebugVLD + x64 + + + Debug + Win32 + + + Release + Win32 + + + Debug + x64 + + + Release + x64 + + + + + + + + + + + + + + + {7D43117B-CB6A-44D2-A79B-6E035CD8FA04} + Win32Proj + striped-map + 8.1 + + + + Application + true + v140 + Unicode + + + Application + true + v140 + Unicode + + + Application + false + v140 + true + Unicode + + + Application + true + v140 + Unicode + + + Application + true + v140 + Unicode + + + Application + false + v140 + true + Unicode + + + + + + + + + + + + + + + + + + + + + + + + + + + true + $(SolutionDir)..\..\..\bin\vc.$(PlatformToolset)\$(Platform)\ + $(SolutionDir)..\..\..\obj\vc.$(PlatformToolset)\$(Platform)\$(ProjectName)\$(Configuration)\ + $(ProjectName)_d + + + true + $(SolutionDir)..\..\..\bin\vc.$(PlatformToolset)\$(Platform)\ + $(SolutionDir)..\..\..\obj\vc.$(PlatformToolset)\$(Platform)\$(ProjectName)\$(Configuration)\ + $(ProjectName)_d + + + true + $(SolutionDir)..\..\..\bin\vc.$(PlatformToolset)\$(Platform)\ + $(SolutionDir)..\..\..\obj\vc.$(PlatformToolset)\$(Platform)\$(ProjectName)\$(Configuration)\ + $(ProjectName)_d + + + true + $(SolutionDir)..\..\..\bin\vc.$(PlatformToolset)\$(Platform)\ + $(SolutionDir)..\..\..\obj\vc.$(PlatformToolset)\$(Platform)\$(ProjectName)\$(Configuration)\ + $(ProjectName)_d + + + false + $(SolutionDir)..\..\..\bin\vc.$(PlatformToolset)\$(Platform)-release\ + $(SolutionDir)..\..\..\obj\vc.$(PlatformToolset)\$(Platform)\$(ProjectName)\$(Configuration)\ + + + false + $(SolutionDir)..\..\..\bin\vc.$(PlatformToolset)\$(Platform)-release\ + $(SolutionDir)..\..\..\obj\vc.$(PlatformToolset)\$(Platform)\$(ProjectName)\$(Configuration)\ + + + + NotUsing + Level3 + Disabled + _ENABLE_ATOMIC_ALIGNMENT_FIX;CDSUNIT_ENABLE_BOOST_CONTAINER;WIN32;_DEBUG;_CONSOLE;%(PreprocessorDefinitions) + $(SolutionDir)..\..\..;$(GTEST_ROOT)/include;$(SolutionDir)..\..\..\test\include;$(BOOST_PATH);%(AdditionalIncludeDirectories) + /bigobj %(AdditionalOptions) + + + Console + DebugFastLink + $(GTEST_LIB32);$(GTEST_ROOT)/lib/x86;$(BOOST_PATH)/stage32/lib;$(BOOST_PATH)/stage/lib;$(BOOST_PATH)/bin;%(AdditionalLibraryDirectories);$(OutDir) + gtestd.lib;%(AdditionalDependencies) + + + + + NotUsing + Level3 + Disabled + _ENABLE_ATOMIC_ALIGNMENT_FIX;CDSUNIT_ENABLE_BOOST_CONTAINER;WIN32;_DEBUG;_CONSOLE;%(PreprocessorDefinitions) + $(SolutionDir)..\..\..;$(GTEST_ROOT)/include;$(SolutionDir)..\..\..\test\include;$(BOOST_PATH);%(AdditionalIncludeDirectories) + /bigobj %(AdditionalOptions) + + + Console + DebugFastLink + $(GTEST_LIB32);$(GTEST_ROOT)/lib/x86;$(BOOST_PATH)/stage32/lib;$(BOOST_PATH)/stage/lib;$(BOOST_PATH)/bin;%(AdditionalLibraryDirectories);$(OutDir) + gtestd.lib;%(AdditionalDependencies) + + + + + NotUsing + Level3 + Disabled + _ENABLE_ATOMIC_ALIGNMENT_FIX;CDSUNIT_ENABLE_BOOST_CONTAINER;_DEBUG;_CONSOLE;%(PreprocessorDefinitions) + $(SolutionDir)..\..\..;$(GTEST_ROOT)/include;$(SolutionDir)..\..\..\test\include;$(BOOST_PATH);%(AdditionalIncludeDirectories) + /bigobj %(AdditionalOptions) + + + Console + DebugFastLink + $(GTEST_LIB64);$(GTEST_ROOT)/lib/x64;$(BOOST_PATH)/stage64/lib;$(BOOST_PATH)/bin;%(AdditionalLibraryDirectories);$(OutDir) + gtestd.lib;%(AdditionalDependencies) + + + + + NotUsing + Level3 + Disabled + _ENABLE_ATOMIC_ALIGNMENT_FIX;CDSUNIT_ENABLE_BOOST_CONTAINER;_DEBUG;_CONSOLE;%(PreprocessorDefinitions) + $(SolutionDir)..\..\..;$(GTEST_ROOT)/include;$(SolutionDir)..\..\..\test\include;$(BOOST_PATH);%(AdditionalIncludeDirectories) + /bigobj %(AdditionalOptions) + + + Console + DebugFastLink + $(GTEST_LIB64);$(GTEST_ROOT)/lib/x64;$(BOOST_PATH)/stage64/lib;$(BOOST_PATH)/bin;%(AdditionalLibraryDirectories);$(OutDir) + gtestd.lib;%(AdditionalDependencies) + + + + + Level3 + NotUsing + MaxSpeed + true + true + _ENABLE_ATOMIC_ALIGNMENT_FIX;CDSUNIT_ENABLE_BOOST_CONTAINER;WIN32;NDEBUG;_CONSOLE;%(PreprocessorDefinitions) + $(SolutionDir)..\..\..;$(GTEST_ROOT)/include;$(SolutionDir)..\..\..\test\include;$(BOOST_PATH);%(AdditionalIncludeDirectories) + /bigobj %(AdditionalOptions) + + + Console + true + true + true + $(GTEST_LIB32);$(GTEST_ROOT)/lib/x86;$(BOOST_PATH)/stage32/lib;$(BOOST_PATH)/stage/lib;$(BOOST_PATH)/bin;%(AdditionalLibraryDirectories);$(OutDir) + gtest.lib;%(AdditionalDependencies) + + + + + Level3 + NotUsing + MaxSpeed + true + true + _ENABLE_ATOMIC_ALIGNMENT_FIX;CDSUNIT_ENABLE_BOOST_CONTAINER;NDEBUG;_CONSOLE;%(PreprocessorDefinitions) + $(SolutionDir)..\..\..;$(GTEST_ROOT)/include;$(SolutionDir)..\..\..\test\include;$(BOOST_PATH);%(AdditionalIncludeDirectories) + /bigobj %(AdditionalOptions) + + + Console + true + true + true + $(GTEST_LIB64);$(GTEST_ROOT)/lib/x64;$(BOOST_PATH)/stage64/lib;$(BOOST_PATH)/bin;%(AdditionalLibraryDirectories);$(OutDir) + gtest.lib;%(AdditionalDependencies) + + + + + + \ No newline at end of file diff --git a/projects/Win/vc14/gtest-striped-map.vcxproj.filters b/projects/Win/vc14/gtest-striped-map.vcxproj.filters deleted file mode 100644 index cd872963..00000000 --- a/projects/Win/vc14/gtest-striped-map.vcxproj.filters +++ /dev/null @@ -1,56 +0,0 @@ - - - - - {4FC737F1-C7A5-4376-A066-2A32D752A2FF} - cpp;c;cc;cxx;def;odl;idl;hpj;bat;asm;asmx - - - {93995380-89BD-4b04-88EB-625FBE52EBFB} - h;hh;hpp;hxx;hm;inl;inc;xsd - - - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - - - Header Files - - - Header Files - - - Header Files - - - \ No newline at end of file diff --git a/projects/Win/vc14/gtest-striped-set-boost.vcxproj b/projects/Win/vc14/gtest-striped-set-boost.vcxproj new file mode 100644 index 00000000..fee34b57 --- /dev/null +++ b/projects/Win/vc14/gtest-striped-set-boost.vcxproj @@ -0,0 +1,263 @@ + + + + + DebugVLD + Win32 + + + DebugVLD + x64 + + + Debug + Win32 + + + Release + Win32 + + + Debug + x64 + + + Release + x64 + + + + + + + + + + + + + + + + + + + + + + + + + + + + {F7A98219-FA54-4CEA-9813-5873A6676D3C} + Win32Proj + striped-set + 8.1 + + + + Application + true + v140 + Unicode + + + Application + true + v140 + Unicode + + + Application + false + v140 + true + Unicode + + + Application + true + v140 + Unicode + + + Application + true + v140 + Unicode + + + Application + false + v140 + true + Unicode + + + + + + + + + + + + + + + + + + + + + + + + + + + true + $(SolutionDir)..\..\..\bin\vc.$(PlatformToolset)\$(Platform)\ + $(SolutionDir)..\..\..\obj\vc.$(PlatformToolset)\$(Platform)\$(ProjectName)\$(Configuration)\ + $(ProjectName)_d + + + true + $(SolutionDir)..\..\..\bin\vc.$(PlatformToolset)\$(Platform)\ + $(SolutionDir)..\..\..\obj\vc.$(PlatformToolset)\$(Platform)\$(ProjectName)\$(Configuration)\ + $(ProjectName)_d + + + true + $(SolutionDir)..\..\..\bin\vc.$(PlatformToolset)\$(Platform)\ + $(SolutionDir)..\..\..\obj\vc.$(PlatformToolset)\$(Platform)\$(ProjectName)\$(Configuration)\ + $(ProjectName)_d + + + true + $(SolutionDir)..\..\..\bin\vc.$(PlatformToolset)\$(Platform)\ + $(SolutionDir)..\..\..\obj\vc.$(PlatformToolset)\$(Platform)\$(ProjectName)\$(Configuration)\ + $(ProjectName)_d + + + false + $(SolutionDir)..\..\..\bin\vc.$(PlatformToolset)\$(Platform)-release\ + $(SolutionDir)..\..\..\obj\vc.$(PlatformToolset)\$(Platform)\$(ProjectName)\$(Configuration)\ + + + false + $(SolutionDir)..\..\..\bin\vc.$(PlatformToolset)\$(Platform)-release\ + $(SolutionDir)..\..\..\obj\vc.$(PlatformToolset)\$(Platform)\$(ProjectName)\$(Configuration)\ + + + + NotUsing + Level3 + Disabled + _ENABLE_ATOMIC_ALIGNMENT_FIX;CDSUNIT_ENABLE_BOOST_CONTAINER;WIN32;_DEBUG;_CONSOLE;%(PreprocessorDefinitions) + $(SolutionDir)..\..\..;$(GTEST_ROOT)/include;$(SolutionDir)..\..\..\test\include;$(BOOST_PATH);%(AdditionalIncludeDirectories) + /bigobj %(AdditionalOptions) + + + Console + DebugFastLink + $(GTEST_LIB32);$(GTEST_ROOT)/lib/x86;$(BOOST_PATH)/stage32/lib;$(BOOST_PATH)/stage/lib;$(BOOST_PATH)/bin;%(AdditionalLibraryDirectories);$(OutDir) + gtestd.lib;%(AdditionalDependencies) + + + + + NotUsing + Level3 + Disabled + _ENABLE_ATOMIC_ALIGNMENT_FIX;CDSUNIT_ENABLE_BOOST_CONTAINER;WIN32;_DEBUG;_CONSOLE;%(PreprocessorDefinitions) + $(SolutionDir)..\..\..;$(GTEST_ROOT)/include;$(SolutionDir)..\..\..\test\include;$(BOOST_PATH);%(AdditionalIncludeDirectories) + /bigobj %(AdditionalOptions) + + + Console + DebugFastLink + $(GTEST_LIB32);$(GTEST_ROOT)/lib/x86;$(BOOST_PATH)/stage32/lib;$(BOOST_PATH)/stage/lib;$(BOOST_PATH)/bin;%(AdditionalLibraryDirectories);$(OutDir) + gtestd.lib;%(AdditionalDependencies) + + + + + NotUsing + Level3 + Disabled + _ENABLE_ATOMIC_ALIGNMENT_FIX;CDSUNIT_ENABLE_BOOST_CONTAINER;_DEBUG;_CONSOLE;%(PreprocessorDefinitions) + $(SolutionDir)..\..\..;$(GTEST_ROOT)/include;$(SolutionDir)..\..\..\test\include;$(BOOST_PATH);%(AdditionalIncludeDirectories) + /bigobj %(AdditionalOptions) + + + Console + DebugFastLink + $(GTEST_LIB64);$(GTEST_ROOT)/lib/x64;$(BOOST_PATH)/stage64/lib;$(BOOST_PATH)/bin;%(AdditionalLibraryDirectories);$(OutDir) + gtestd.lib;%(AdditionalDependencies) + + + + + NotUsing + Level3 + Disabled + _ENABLE_ATOMIC_ALIGNMENT_FIX;CDSUNIT_ENABLE_BOOST_CONTAINER;_DEBUG;_CONSOLE;%(PreprocessorDefinitions) + $(SolutionDir)..\..\..;$(GTEST_ROOT)/include;$(SolutionDir)..\..\..\test\include;$(BOOST_PATH);%(AdditionalIncludeDirectories) + /bigobj %(AdditionalOptions) + + + Console + DebugFastLink + $(GTEST_LIB64);$(GTEST_ROOT)/lib/x64;$(BOOST_PATH)/stage64/lib;$(BOOST_PATH)/bin;%(AdditionalLibraryDirectories);$(OutDir) + gtestd.lib;%(AdditionalDependencies) + + + + + Level3 + NotUsing + MaxSpeed + true + true + _ENABLE_ATOMIC_ALIGNMENT_FIX;CDSUNIT_ENABLE_BOOST_CONTAINER;WIN32;NDEBUG;_CONSOLE;%(PreprocessorDefinitions) + $(SolutionDir)..\..\..;$(GTEST_ROOT)/include;$(SolutionDir)..\..\..\test\include;$(BOOST_PATH);%(AdditionalIncludeDirectories) + /bigobj %(AdditionalOptions) + + + Console + true + true + true + $(GTEST_LIB32);$(GTEST_ROOT)/lib/x86;$(BOOST_PATH)/stage32/lib;$(BOOST_PATH)/stage/lib;$(BOOST_PATH)/bin;%(AdditionalLibraryDirectories);$(OutDir) + gtest.lib;%(AdditionalDependencies) + + + + + Level3 + NotUsing + MaxSpeed + true + true + _ENABLE_ATOMIC_ALIGNMENT_FIX;CDSUNIT_ENABLE_BOOST_CONTAINER;NDEBUG;_CONSOLE;%(PreprocessorDefinitions) + $(SolutionDir)..\..\..;$(GTEST_ROOT)/include;$(SolutionDir)..\..\..\test\include;$(BOOST_PATH);%(AdditionalIncludeDirectories) + /bigobj %(AdditionalOptions) + + + Console + true + true + true + $(GTEST_LIB64);$(GTEST_ROOT)/lib/x64;$(BOOST_PATH)/stage64/lib;$(BOOST_PATH)/bin;%(AdditionalLibraryDirectories);$(OutDir) + gtest.lib;%(AdditionalDependencies) + + + + + + \ No newline at end of file diff --git a/projects/Win/vc14/gtest-striped-set.vcxproj b/projects/Win/vc14/gtest-striped-set-cuckoo.vcxproj similarity index 90% rename from projects/Win/vc14/gtest-striped-set.vcxproj rename to projects/Win/vc14/gtest-striped-set-cuckoo.vcxproj index 7b31e32b..4b6d4275 100644 --- a/projects/Win/vc14/gtest-striped-set.vcxproj +++ b/projects/Win/vc14/gtest-striped-set-cuckoo.vcxproj @@ -1,289 +1,270 @@ - - - - - DebugVLD - Win32 - - - DebugVLD - x64 - - - Debug - Win32 - - - Release - Win32 - - - Debug - x64 - - - Release - x64 - - - - - - 4503 - 4503 - 4503 - 4503 - 4503 - 4503 - _SCL_SECURE_NO_WARNINGS;WIN32;_DEBUG;_CONSOLE;%(PreprocessorDefinitions) - _SCL_SECURE_NO_WARNINGS;WIN32;_DEBUG;_CONSOLE;%(PreprocessorDefinitions) - _SCL_SECURE_NO_WARNINGS;WIN32;NDEBUG;_CONSOLE;%(PreprocessorDefinitions) - _SCL_SECURE_NO_WARNINGS;_DEBUG;_CONSOLE;%(PreprocessorDefinitions) - _SCL_SECURE_NO_WARNINGS;_DEBUG;_CONSOLE;%(PreprocessorDefinitions) - _SCL_SECURE_NO_WARNINGS;NDEBUG;_CONSOLE;%(PreprocessorDefinitions) - - - - - - - - - - _SCL_SECURE_NO_WARNINGS;%(PreprocessorDefinitions) - _SCL_SECURE_NO_WARNINGS;%(PreprocessorDefinitions) - _SCL_SECURE_NO_WARNINGS;%(PreprocessorDefinitions) - _SCL_SECURE_NO_WARNINGS;%(PreprocessorDefinitions) - _SCL_SECURE_NO_WARNINGS;%(PreprocessorDefinitions) - _SCL_SECURE_NO_WARNINGS;%(PreprocessorDefinitions) - - - - - - - - - - - - - - - - - - - - - - {648021D3-6E18-4B94-88B8-F6A59609E210} - Win32Proj - striped-set - 8.1 - - - - Application - true - v140 - Unicode - - - Application - true - v140 - Unicode - - - Application - false - v140 - true - Unicode - - - Application - true - v140 - Unicode - - - Application - true - v140 - Unicode - - - Application - false - v140 - true - Unicode - - - - - - - - - - - - - - - - - - - - - - - - - - - true - $(SolutionDir)..\..\..\bin\vc.$(PlatformToolset)\$(Platform)\ - $(SolutionDir)..\..\..\obj\vc.$(PlatformToolset)\$(Platform)\$(ProjectName)\$(Configuration)\ - $(ProjectName)_d - - - true - $(SolutionDir)..\..\..\bin\vc.$(PlatformToolset)\$(Platform)\ - $(SolutionDir)..\..\..\obj\vc.$(PlatformToolset)\$(Platform)\$(ProjectName)\$(Configuration)\ - $(ProjectName)_d - - - true - $(SolutionDir)..\..\..\bin\vc.$(PlatformToolset)\$(Platform)\ - $(SolutionDir)..\..\..\obj\vc.$(PlatformToolset)\$(Platform)\$(ProjectName)\$(Configuration)\ - $(ProjectName)_d - - - true - $(SolutionDir)..\..\..\bin\vc.$(PlatformToolset)\$(Platform)\ - $(SolutionDir)..\..\..\obj\vc.$(PlatformToolset)\$(Platform)\$(ProjectName)\$(Configuration)\ - $(ProjectName)_d - - - false - $(SolutionDir)..\..\..\bin\vc.$(PlatformToolset)\$(Platform)-release\ - $(SolutionDir)..\..\..\obj\vc.$(PlatformToolset)\$(Platform)\$(ProjectName)\$(Configuration)\ - - - false - $(SolutionDir)..\..\..\bin\vc.$(PlatformToolset)\$(Platform)-release\ - $(SolutionDir)..\..\..\obj\vc.$(PlatformToolset)\$(Platform)\$(ProjectName)\$(Configuration)\ - - - - NotUsing - Level3 - Disabled - _ENABLE_ATOMIC_ALIGNMENT_FIX;CDSUNIT_ENABLE_BOOST_CONTAINER;WIN32;_DEBUG;_CONSOLE;%(PreprocessorDefinitions) - $(SolutionDir)..\..\..;$(GTEST_ROOT)/include;$(SolutionDir)..\..\..\test\include;$(BOOST_PATH);%(AdditionalIncludeDirectories) - /bigobj %(AdditionalOptions) - - - Console - DebugFastLink - $(GTEST_LIB32);$(GTEST_ROOT)/lib/x86;$(BOOST_PATH)/stage32/lib;$(BOOST_PATH)/stage/lib;$(BOOST_PATH)/bin;%(AdditionalLibraryDirectories);$(OutDir) - gtestd.lib;%(AdditionalDependencies) - - - - - NotUsing - Level3 - Disabled - _ENABLE_ATOMIC_ALIGNMENT_FIX;CDSUNIT_ENABLE_BOOST_CONTAINER;WIN32;_DEBUG;_CONSOLE;%(PreprocessorDefinitions) - $(SolutionDir)..\..\..;$(GTEST_ROOT)/include;$(SolutionDir)..\..\..\test\include;$(BOOST_PATH);%(AdditionalIncludeDirectories) - /bigobj %(AdditionalOptions) - - - Console - DebugFastLink - $(GTEST_LIB32);$(GTEST_ROOT)/lib/x86;$(BOOST_PATH)/stage32/lib;$(BOOST_PATH)/stage/lib;$(BOOST_PATH)/bin;%(AdditionalLibraryDirectories);$(OutDir) - gtestd.lib;%(AdditionalDependencies) - - - - - NotUsing - Level3 - Disabled - _ENABLE_ATOMIC_ALIGNMENT_FIX;CDSUNIT_ENABLE_BOOST_CONTAINER;_DEBUG;_CONSOLE;%(PreprocessorDefinitions) - $(SolutionDir)..\..\..;$(GTEST_ROOT)/include;$(SolutionDir)..\..\..\test\include;$(BOOST_PATH);%(AdditionalIncludeDirectories) - /bigobj %(AdditionalOptions) - - - Console - DebugFastLink - $(GTEST_LIB64);$(GTEST_ROOT)/lib/x64;$(BOOST_PATH)/stage64/lib;$(BOOST_PATH)/bin;%(AdditionalLibraryDirectories);$(OutDir) - gtestd.lib;%(AdditionalDependencies) - - - - - NotUsing - Level3 - Disabled - _ENABLE_ATOMIC_ALIGNMENT_FIX;CDSUNIT_ENABLE_BOOST_CONTAINER;_DEBUG;_CONSOLE;%(PreprocessorDefinitions) - $(SolutionDir)..\..\..;$(GTEST_ROOT)/include;$(SolutionDir)..\..\..\test\include;$(BOOST_PATH);%(AdditionalIncludeDirectories) - /bigobj %(AdditionalOptions) - - - Console - DebugFastLink - $(GTEST_LIB64);$(GTEST_ROOT)/lib/x64;$(BOOST_PATH)/stage64/lib;$(BOOST_PATH)/bin;%(AdditionalLibraryDirectories);$(OutDir) - gtestd.lib;%(AdditionalDependencies) - - - - - Level3 - NotUsing - MaxSpeed - true - true - _ENABLE_ATOMIC_ALIGNMENT_FIX;CDSUNIT_ENABLE_BOOST_CONTAINER;WIN32;NDEBUG;_CONSOLE;%(PreprocessorDefinitions) - $(SolutionDir)..\..\..;$(GTEST_ROOT)/include;$(SolutionDir)..\..\..\test\include;$(BOOST_PATH);%(AdditionalIncludeDirectories) - /bigobj %(AdditionalOptions) - - - Console - true - true - true - $(GTEST_LIB32);$(GTEST_ROOT)/lib/x86;$(BOOST_PATH)/stage32/lib;$(BOOST_PATH)/stage/lib;$(BOOST_PATH)/bin;%(AdditionalLibraryDirectories);$(OutDir) - gtest.lib;%(AdditionalDependencies) - - - - - Level3 - NotUsing - MaxSpeed - true - true - _ENABLE_ATOMIC_ALIGNMENT_FIX;CDSUNIT_ENABLE_BOOST_CONTAINER;NDEBUG;_CONSOLE;%(PreprocessorDefinitions) - $(SolutionDir)..\..\..;$(GTEST_ROOT)/include;$(SolutionDir)..\..\..\test\include;$(BOOST_PATH);%(AdditionalIncludeDirectories) - /bigobj %(AdditionalOptions) - - - Console - true - true - true - $(GTEST_LIB64);$(GTEST_ROOT)/lib/x64;$(BOOST_PATH)/stage64/lib;$(BOOST_PATH)/bin;%(AdditionalLibraryDirectories);$(OutDir) - gtest.lib;%(AdditionalDependencies) - - - - - + + + + + DebugVLD + Win32 + + + DebugVLD + x64 + + + Debug + Win32 + + + Release + Win32 + + + Debug + x64 + + + Release + x64 + + + + + + 4503 + 4503 + 4503 + 4503 + 4503 + 4503 + _SCL_SECURE_NO_WARNINGS;WIN32;_DEBUG;_CONSOLE;%(PreprocessorDefinitions) + _SCL_SECURE_NO_WARNINGS;WIN32;_DEBUG;_CONSOLE;%(PreprocessorDefinitions) + _SCL_SECURE_NO_WARNINGS;WIN32;NDEBUG;_CONSOLE;%(PreprocessorDefinitions) + _SCL_SECURE_NO_WARNINGS;_DEBUG;_CONSOLE;%(PreprocessorDefinitions) + _SCL_SECURE_NO_WARNINGS;_DEBUG;_CONSOLE;%(PreprocessorDefinitions) + _SCL_SECURE_NO_WARNINGS;NDEBUG;_CONSOLE;%(PreprocessorDefinitions) + + + _SCL_SECURE_NO_WARNINGS;%(PreprocessorDefinitions) + _SCL_SECURE_NO_WARNINGS;%(PreprocessorDefinitions) + _SCL_SECURE_NO_WARNINGS;%(PreprocessorDefinitions) + _SCL_SECURE_NO_WARNINGS;%(PreprocessorDefinitions) + _SCL_SECURE_NO_WARNINGS;%(PreprocessorDefinitions) + _SCL_SECURE_NO_WARNINGS;%(PreprocessorDefinitions) + + + + + + + + + + {E6C84E07-A02C-4F91-B759-6CA4730F4534} + Win32Proj + striped-set + 8.1 + + + + Application + true + v140 + Unicode + + + Application + true + v140 + Unicode + + + Application + false + v140 + true + Unicode + + + Application + true + v140 + Unicode + + + Application + true + v140 + Unicode + + + Application + false + v140 + true + Unicode + + + + + + + + + + + + + + + + + + + + + + + + + + + true + $(SolutionDir)..\..\..\bin\vc.$(PlatformToolset)\$(Platform)\ + $(SolutionDir)..\..\..\obj\vc.$(PlatformToolset)\$(Platform)\$(ProjectName)\$(Configuration)\ + $(ProjectName)_d + + + true + $(SolutionDir)..\..\..\bin\vc.$(PlatformToolset)\$(Platform)\ + $(SolutionDir)..\..\..\obj\vc.$(PlatformToolset)\$(Platform)\$(ProjectName)\$(Configuration)\ + $(ProjectName)_d + + + true + $(SolutionDir)..\..\..\bin\vc.$(PlatformToolset)\$(Platform)\ + $(SolutionDir)..\..\..\obj\vc.$(PlatformToolset)\$(Platform)\$(ProjectName)\$(Configuration)\ + $(ProjectName)_d + + + true + $(SolutionDir)..\..\..\bin\vc.$(PlatformToolset)\$(Platform)\ + $(SolutionDir)..\..\..\obj\vc.$(PlatformToolset)\$(Platform)\$(ProjectName)\$(Configuration)\ + $(ProjectName)_d + + + false + $(SolutionDir)..\..\..\bin\vc.$(PlatformToolset)\$(Platform)-release\ + $(SolutionDir)..\..\..\obj\vc.$(PlatformToolset)\$(Platform)\$(ProjectName)\$(Configuration)\ + + + false + $(SolutionDir)..\..\..\bin\vc.$(PlatformToolset)\$(Platform)-release\ + $(SolutionDir)..\..\..\obj\vc.$(PlatformToolset)\$(Platform)\$(ProjectName)\$(Configuration)\ + + + + NotUsing + Level3 + Disabled + _ENABLE_ATOMIC_ALIGNMENT_FIX;CDSUNIT_ENABLE_BOOST_CONTAINER;WIN32;_DEBUG;_CONSOLE;%(PreprocessorDefinitions) + $(SolutionDir)..\..\..;$(GTEST_ROOT)/include;$(SolutionDir)..\..\..\test\include;$(BOOST_PATH);%(AdditionalIncludeDirectories) + /bigobj %(AdditionalOptions) + + + Console + DebugFastLink + $(GTEST_LIB32);$(GTEST_ROOT)/lib/x86;$(BOOST_PATH)/stage32/lib;$(BOOST_PATH)/stage/lib;$(BOOST_PATH)/bin;%(AdditionalLibraryDirectories);$(OutDir) + gtestd.lib;%(AdditionalDependencies) + + + + + NotUsing + Level3 + Disabled + _ENABLE_ATOMIC_ALIGNMENT_FIX;CDSUNIT_ENABLE_BOOST_CONTAINER;WIN32;_DEBUG;_CONSOLE;%(PreprocessorDefinitions) + $(SolutionDir)..\..\..;$(GTEST_ROOT)/include;$(SolutionDir)..\..\..\test\include;$(BOOST_PATH);%(AdditionalIncludeDirectories) + /bigobj %(AdditionalOptions) + + + Console + DebugFastLink + $(GTEST_LIB32);$(GTEST_ROOT)/lib/x86;$(BOOST_PATH)/stage32/lib;$(BOOST_PATH)/stage/lib;$(BOOST_PATH)/bin;%(AdditionalLibraryDirectories);$(OutDir) + gtestd.lib;%(AdditionalDependencies) + + + + + NotUsing + Level3 + Disabled + _ENABLE_ATOMIC_ALIGNMENT_FIX;CDSUNIT_ENABLE_BOOST_CONTAINER;_DEBUG;_CONSOLE;%(PreprocessorDefinitions) + $(SolutionDir)..\..\..;$(GTEST_ROOT)/include;$(SolutionDir)..\..\..\test\include;$(BOOST_PATH);%(AdditionalIncludeDirectories) + /bigobj %(AdditionalOptions) + + + Console + DebugFastLink + $(GTEST_LIB64);$(GTEST_ROOT)/lib/x64;$(BOOST_PATH)/stage64/lib;$(BOOST_PATH)/bin;%(AdditionalLibraryDirectories);$(OutDir) + gtestd.lib;%(AdditionalDependencies) + + + + + NotUsing + Level3 + Disabled + _ENABLE_ATOMIC_ALIGNMENT_FIX;CDSUNIT_ENABLE_BOOST_CONTAINER;_DEBUG;_CONSOLE;%(PreprocessorDefinitions) + $(SolutionDir)..\..\..;$(GTEST_ROOT)/include;$(SolutionDir)..\..\..\test\include;$(BOOST_PATH);%(AdditionalIncludeDirectories) + /bigobj %(AdditionalOptions) + + + Console + DebugFastLink + $(GTEST_LIB64);$(GTEST_ROOT)/lib/x64;$(BOOST_PATH)/stage64/lib;$(BOOST_PATH)/bin;%(AdditionalLibraryDirectories);$(OutDir) + gtestd.lib;%(AdditionalDependencies) + + + + + Level3 + NotUsing + MaxSpeed + true + true + _ENABLE_ATOMIC_ALIGNMENT_FIX;CDSUNIT_ENABLE_BOOST_CONTAINER;WIN32;NDEBUG;_CONSOLE;%(PreprocessorDefinitions) + $(SolutionDir)..\..\..;$(GTEST_ROOT)/include;$(SolutionDir)..\..\..\test\include;$(BOOST_PATH);%(AdditionalIncludeDirectories) + /bigobj %(AdditionalOptions) + + + Console + true + true + true + $(GTEST_LIB32);$(GTEST_ROOT)/lib/x86;$(BOOST_PATH)/stage32/lib;$(BOOST_PATH)/stage/lib;$(BOOST_PATH)/bin;%(AdditionalLibraryDirectories);$(OutDir) + gtest.lib;%(AdditionalDependencies) + + + + + Level3 + NotUsing + MaxSpeed + true + true + _ENABLE_ATOMIC_ALIGNMENT_FIX;CDSUNIT_ENABLE_BOOST_CONTAINER;NDEBUG;_CONSOLE;%(PreprocessorDefinitions) + $(SolutionDir)..\..\..;$(GTEST_ROOT)/include;$(SolutionDir)..\..\..\test\include;$(BOOST_PATH);%(AdditionalIncludeDirectories) + /bigobj %(AdditionalOptions) + + + Console + true + true + true + $(GTEST_LIB64);$(GTEST_ROOT)/lib/x64;$(BOOST_PATH)/stage64/lib;$(BOOST_PATH)/bin;%(AdditionalLibraryDirectories);$(OutDir) + gtest.lib;%(AdditionalDependencies) + + + + + \ No newline at end of file diff --git a/projects/Win/vc14/gtest-striped-set-std.vcxproj b/projects/Win/vc14/gtest-striped-set-std.vcxproj new file mode 100644 index 00000000..76e9a180 --- /dev/null +++ b/projects/Win/vc14/gtest-striped-set-std.vcxproj @@ -0,0 +1,250 @@ + + + + + DebugVLD + Win32 + + + DebugVLD + x64 + + + Debug + Win32 + + + Release + Win32 + + + Debug + x64 + + + Release + x64 + + + + + + + + + + + + + + + {BC6BCA1F-3850-4571-ADE2-BB11C2B68807} + Win32Proj + striped-set + 8.1 + + + + Application + true + v140 + Unicode + + + Application + true + v140 + Unicode + + + Application + false + v140 + true + Unicode + + + Application + true + v140 + Unicode + + + Application + true + v140 + Unicode + + + Application + false + v140 + true + Unicode + + + + + + + + + + + + + + + + + + + + + + + + + + + true + $(SolutionDir)..\..\..\bin\vc.$(PlatformToolset)\$(Platform)\ + $(SolutionDir)..\..\..\obj\vc.$(PlatformToolset)\$(Platform)\$(ProjectName)\$(Configuration)\ + $(ProjectName)_d + + + true + $(SolutionDir)..\..\..\bin\vc.$(PlatformToolset)\$(Platform)\ + $(SolutionDir)..\..\..\obj\vc.$(PlatformToolset)\$(Platform)\$(ProjectName)\$(Configuration)\ + $(ProjectName)_d + + + true + $(SolutionDir)..\..\..\bin\vc.$(PlatformToolset)\$(Platform)\ + $(SolutionDir)..\..\..\obj\vc.$(PlatformToolset)\$(Platform)\$(ProjectName)\$(Configuration)\ + $(ProjectName)_d + + + true + $(SolutionDir)..\..\..\bin\vc.$(PlatformToolset)\$(Platform)\ + $(SolutionDir)..\..\..\obj\vc.$(PlatformToolset)\$(Platform)\$(ProjectName)\$(Configuration)\ + $(ProjectName)_d + + + false + $(SolutionDir)..\..\..\bin\vc.$(PlatformToolset)\$(Platform)-release\ + $(SolutionDir)..\..\..\obj\vc.$(PlatformToolset)\$(Platform)\$(ProjectName)\$(Configuration)\ + + + false + $(SolutionDir)..\..\..\bin\vc.$(PlatformToolset)\$(Platform)-release\ + $(SolutionDir)..\..\..\obj\vc.$(PlatformToolset)\$(Platform)\$(ProjectName)\$(Configuration)\ + + + + NotUsing + Level3 + Disabled + _ENABLE_ATOMIC_ALIGNMENT_FIX;CDSUNIT_ENABLE_BOOST_CONTAINER;WIN32;_DEBUG;_CONSOLE;%(PreprocessorDefinitions) + $(SolutionDir)..\..\..;$(GTEST_ROOT)/include;$(SolutionDir)..\..\..\test\include;$(BOOST_PATH);%(AdditionalIncludeDirectories) + /bigobj %(AdditionalOptions) + + + Console + DebugFastLink + $(GTEST_LIB32);$(GTEST_ROOT)/lib/x86;$(BOOST_PATH)/stage32/lib;$(BOOST_PATH)/stage/lib;$(BOOST_PATH)/bin;%(AdditionalLibraryDirectories);$(OutDir) + gtestd.lib;%(AdditionalDependencies) + + + + + NotUsing + Level3 + Disabled + _ENABLE_ATOMIC_ALIGNMENT_FIX;CDSUNIT_ENABLE_BOOST_CONTAINER;WIN32;_DEBUG;_CONSOLE;%(PreprocessorDefinitions) + $(SolutionDir)..\..\..;$(GTEST_ROOT)/include;$(SolutionDir)..\..\..\test\include;$(BOOST_PATH);%(AdditionalIncludeDirectories) + /bigobj %(AdditionalOptions) + + + Console + DebugFastLink + $(GTEST_LIB32);$(GTEST_ROOT)/lib/x86;$(BOOST_PATH)/stage32/lib;$(BOOST_PATH)/stage/lib;$(BOOST_PATH)/bin;%(AdditionalLibraryDirectories);$(OutDir) + gtestd.lib;%(AdditionalDependencies) + + + + + NotUsing + Level3 + Disabled + _ENABLE_ATOMIC_ALIGNMENT_FIX;CDSUNIT_ENABLE_BOOST_CONTAINER;_DEBUG;_CONSOLE;%(PreprocessorDefinitions) + $(SolutionDir)..\..\..;$(GTEST_ROOT)/include;$(SolutionDir)..\..\..\test\include;$(BOOST_PATH);%(AdditionalIncludeDirectories) + /bigobj %(AdditionalOptions) + + + Console + DebugFastLink + $(GTEST_LIB64);$(GTEST_ROOT)/lib/x64;$(BOOST_PATH)/stage64/lib;$(BOOST_PATH)/bin;%(AdditionalLibraryDirectories);$(OutDir) + gtestd.lib;%(AdditionalDependencies) + + + + + NotUsing + Level3 + Disabled + _ENABLE_ATOMIC_ALIGNMENT_FIX;CDSUNIT_ENABLE_BOOST_CONTAINER;_DEBUG;_CONSOLE;%(PreprocessorDefinitions) + $(SolutionDir)..\..\..;$(GTEST_ROOT)/include;$(SolutionDir)..\..\..\test\include;$(BOOST_PATH);%(AdditionalIncludeDirectories) + /bigobj %(AdditionalOptions) + + + Console + DebugFastLink + $(GTEST_LIB64);$(GTEST_ROOT)/lib/x64;$(BOOST_PATH)/stage64/lib;$(BOOST_PATH)/bin;%(AdditionalLibraryDirectories);$(OutDir) + gtestd.lib;%(AdditionalDependencies) + + + + + Level3 + NotUsing + MaxSpeed + true + true + _ENABLE_ATOMIC_ALIGNMENT_FIX;CDSUNIT_ENABLE_BOOST_CONTAINER;WIN32;NDEBUG;_CONSOLE;%(PreprocessorDefinitions) + $(SolutionDir)..\..\..;$(GTEST_ROOT)/include;$(SolutionDir)..\..\..\test\include;$(BOOST_PATH);%(AdditionalIncludeDirectories) + /bigobj %(AdditionalOptions) + + + Console + true + true + true + $(GTEST_LIB32);$(GTEST_ROOT)/lib/x86;$(BOOST_PATH)/stage32/lib;$(BOOST_PATH)/stage/lib;$(BOOST_PATH)/bin;%(AdditionalLibraryDirectories);$(OutDir) + gtest.lib;%(AdditionalDependencies) + + + + + Level3 + NotUsing + MaxSpeed + true + true + _ENABLE_ATOMIC_ALIGNMENT_FIX;CDSUNIT_ENABLE_BOOST_CONTAINER;NDEBUG;_CONSOLE;%(PreprocessorDefinitions) + $(SolutionDir)..\..\..;$(GTEST_ROOT)/include;$(SolutionDir)..\..\..\test\include;$(BOOST_PATH);%(AdditionalIncludeDirectories) + /bigobj %(AdditionalOptions) + + + Console + true + true + true + $(GTEST_LIB64);$(GTEST_ROOT)/lib/x64;$(BOOST_PATH)/stage64/lib;$(BOOST_PATH)/bin;%(AdditionalLibraryDirectories);$(OutDir) + gtest.lib;%(AdditionalDependencies) + + + + + + \ No newline at end of file diff --git a/projects/Win/vc14/gtest-striped-set.vcxproj.filters b/projects/Win/vc14/gtest-striped-set.vcxproj.filters deleted file mode 100644 index 2b7c7c59..00000000 --- a/projects/Win/vc14/gtest-striped-set.vcxproj.filters +++ /dev/null @@ -1,95 +0,0 @@ - - - - - {4FC737F1-C7A5-4376-A066-2A32D752A2FF} - cpp;c;cc;cxx;def;odl;idl;hpj;bat;asm;asmx - - - {93995380-89BD-4b04-88EB-625FBE52EBFB} - h;hh;hpp;hxx;hm;inl;inc;xsd - - - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - - - Header Files - - - Header Files - - - Header Files - - - Header Files - - - \ No newline at end of file diff --git a/projects/Win/vc14/gtest-tree-bronson.vcxproj b/projects/Win/vc14/gtest-tree-bronson.vcxproj new file mode 100644 index 00000000..07c113b9 --- /dev/null +++ b/projects/Win/vc14/gtest-tree-bronson.vcxproj @@ -0,0 +1,259 @@ + + + + + DebugVLD + Win32 + + + DebugVLD + x64 + + + Debug + Win32 + + + Release + Win32 + + + Debug + x64 + + + Release + x64 + + + + + + + + + + + + + + + + + + + + + + + + {27AB018B-953E-4632-B6A9-A4E9782A81BA} + Win32Proj + tree + 8.1 + + + + Application + true + v140 + Unicode + + + Application + true + v140 + Unicode + + + Application + false + v140 + true + Unicode + + + Application + true + v140 + Unicode + + + Application + true + v140 + Unicode + + + Application + false + v140 + true + Unicode + + + + + + + + + + + + + + + + + + + + + + + + + + + true + $(SolutionDir)..\..\..\bin\vc.$(PlatformToolset)\$(Platform)\ + $(SolutionDir)..\..\..\obj\vc.$(PlatformToolset)\$(Platform)\$(ProjectName)\$(Configuration)\ + $(ProjectName)_d + + + true + $(SolutionDir)..\..\..\bin\vc.$(PlatformToolset)\$(Platform)\ + $(SolutionDir)..\..\..\obj\vc.$(PlatformToolset)\$(Platform)\$(ProjectName)\$(Configuration)\ + $(ProjectName)_d + + + true + $(SolutionDir)..\..\..\bin\vc.$(PlatformToolset)\$(Platform)\ + $(SolutionDir)..\..\..\obj\vc.$(PlatformToolset)\$(Platform)\$(ProjectName)\$(Configuration)\ + $(ProjectName)_d + + + true + $(SolutionDir)..\..\..\bin\vc.$(PlatformToolset)\$(Platform)\ + $(SolutionDir)..\..\..\obj\vc.$(PlatformToolset)\$(Platform)\$(ProjectName)\$(Configuration)\ + $(ProjectName)_d + + + false + $(SolutionDir)..\..\..\bin\vc.$(PlatformToolset)\$(Platform)-release\ + $(SolutionDir)..\..\..\obj\vc.$(PlatformToolset)\$(Platform)\$(ProjectName)\$(Configuration)\ + + + false + $(SolutionDir)..\..\..\bin\vc.$(PlatformToolset)\$(Platform)-release\ + $(SolutionDir)..\..\..\obj\vc.$(PlatformToolset)\$(Platform)\$(ProjectName)\$(Configuration)\ + + + + NotUsing + Level3 + Disabled + _ENABLE_ATOMIC_ALIGNMENT_FIX;WIN32;_DEBUG;_CONSOLE;%(PreprocessorDefinitions) + $(SolutionDir)..\..\..;$(GTEST_ROOT)/include;$(SolutionDir)..\..\..\test\include;$(BOOST_PATH);%(AdditionalIncludeDirectories) + /bigobj %(AdditionalOptions) + + + Console + DebugFastLink + $(GTEST_LIB32);$(GTEST_ROOT)/lib/x86;$(BOOST_PATH)/stage32/lib;$(BOOST_PATH)/stage/lib;$(BOOST_PATH)/bin;%(AdditionalLibraryDirectories);$(OutDir) + gtestd.lib;%(AdditionalDependencies) + + + + + NotUsing + Level3 + Disabled + _ENABLE_ATOMIC_ALIGNMENT_FIX;WIN32;_DEBUG;_CONSOLE;%(PreprocessorDefinitions) + $(SolutionDir)..\..\..;$(GTEST_ROOT)/include;$(SolutionDir)..\..\..\test\include;$(BOOST_PATH);%(AdditionalIncludeDirectories) + /bigobj %(AdditionalOptions) + + + Console + DebugFastLink + $(GTEST_LIB32);$(GTEST_ROOT)/lib/x86;$(BOOST_PATH)/stage32/lib;$(BOOST_PATH)/stage/lib;$(BOOST_PATH)/bin;%(AdditionalLibraryDirectories);$(OutDir) + gtestd.lib;%(AdditionalDependencies) + + + + + NotUsing + Level3 + Disabled + _ENABLE_ATOMIC_ALIGNMENT_FIX;_DEBUG;_CONSOLE;%(PreprocessorDefinitions) + $(SolutionDir)..\..\..;$(GTEST_ROOT)/include;$(SolutionDir)..\..\..\test\include;$(BOOST_PATH);%(AdditionalIncludeDirectories) + /bigobj %(AdditionalOptions) + + + Console + DebugFastLink + $(GTEST_LIB64);$(GTEST_ROOT)/lib/x64;$(BOOST_PATH)/stage64/lib;$(BOOST_PATH)/bin;%(AdditionalLibraryDirectories);$(OutDir) + gtestd.lib;%(AdditionalDependencies) + + + + + NotUsing + Level3 + Disabled + _ENABLE_ATOMIC_ALIGNMENT_FIX;_DEBUG;_CONSOLE;%(PreprocessorDefinitions) + $(SolutionDir)..\..\..;$(GTEST_ROOT)/include;$(SolutionDir)..\..\..\test\include;$(BOOST_PATH);%(AdditionalIncludeDirectories) + /bigobj %(AdditionalOptions) + + + Console + DebugFastLink + $(GTEST_LIB64);$(GTEST_ROOT)/lib/x64;$(BOOST_PATH)/stage64/lib;$(BOOST_PATH)/bin;%(AdditionalLibraryDirectories);$(OutDir) + gtestd.lib;%(AdditionalDependencies) + + + + + Level3 + NotUsing + MaxSpeed + true + true + _ENABLE_ATOMIC_ALIGNMENT_FIX;WIN32;NDEBUG;_CONSOLE;%(PreprocessorDefinitions) + $(SolutionDir)..\..\..;$(GTEST_ROOT)/include;$(SolutionDir)..\..\..\test\include;$(BOOST_PATH);%(AdditionalIncludeDirectories) + /bigobj %(AdditionalOptions) + + + Console + true + true + true + $(GTEST_LIB32);$(GTEST_ROOT)/lib/x86;$(BOOST_PATH)/stage32/lib;$(BOOST_PATH)/stage/lib;$(BOOST_PATH)/bin;%(AdditionalLibraryDirectories);$(OutDir) + gtest.lib;%(AdditionalDependencies) + + + + + Level3 + NotUsing + MaxSpeed + true + true + _ENABLE_ATOMIC_ALIGNMENT_FIX;NDEBUG;_CONSOLE;%(PreprocessorDefinitions) + $(SolutionDir)..\..\..;$(GTEST_ROOT)/include;$(SolutionDir)..\..\..\test\include;$(BOOST_PATH);%(AdditionalIncludeDirectories) + /bigobj %(AdditionalOptions) + + + Console + true + true + true + $(GTEST_LIB64);$(GTEST_ROOT)/lib/x64;$(BOOST_PATH)/stage64/lib;$(BOOST_PATH)/bin;%(AdditionalLibraryDirectories);$(OutDir) + gtest.lib;%(AdditionalDependencies) + + + + + + \ No newline at end of file diff --git a/projects/Win/vc14/gtest-tree.vcxproj b/projects/Win/vc14/gtest-tree-ellen.vcxproj similarity index 95% rename from projects/Win/vc14/gtest-tree.vcxproj rename to projects/Win/vc14/gtest-tree-ellen.vcxproj index b2b462d6..14d31dec 100644 --- a/projects/Win/vc14/gtest-tree.vcxproj +++ b/projects/Win/vc14/gtest-tree-ellen.vcxproj @@ -28,16 +28,6 @@ - - - - - - - - - - @@ -125,8 +115,6 @@ - - @@ -143,7 +131,7 @@ - {2ABD6A2E-BEA7-4c8c-982B-A609F83D2DCB} + {93F1FE35-2EF4-4193-B8A2-54988F61F3B8} Win32Proj tree 8.1 diff --git a/projects/Win/vc14/gtest-tree.vcxproj.filters b/projects/Win/vc14/gtest-tree-ellen.vcxproj.filters similarity index 76% rename from projects/Win/vc14/gtest-tree.vcxproj.filters rename to projects/Win/vc14/gtest-tree-ellen.vcxproj.filters index b909eb12..e66c9a26 100644 --- a/projects/Win/vc14/gtest-tree.vcxproj.filters +++ b/projects/Win/vc14/gtest-tree-ellen.vcxproj.filters @@ -18,9 +18,6 @@ {5e8e3c4d-563e-41fd-91ed-52f61f4b7d24} - - {431d0150-603d-4108-810d-de9ac3be3534} - @@ -92,36 +89,6 @@ Source Files\EllenBinTreeMap - - Source Files\BronsonAVLTree - - - Source Files\BronsonAVLTree - - - Source Files\BronsonAVLTree - - - Source Files\BronsonAVLTree - - - Source Files\BronsonAVLTree - - - Source Files\BronsonAVLTree - - - Source Files\BronsonAVLTree - - - Source Files\BronsonAVLTree - - - Source Files\BronsonAVLTree - - - Source Files\BronsonAVLTree - @@ -166,11 +133,5 @@ Header Files - - Header Files - - - Header Files - \ No newline at end of file -- 2.34.1