diff options
author | gabime <gmelman1@gmail.com> | 2018-05-21 16:40:31 +0300 |
---|---|---|
committer | gabime <gmelman1@gmail.com> | 2018-05-21 16:40:31 +0300 |
commit | dc328de72ac91f4233ad06da37a9804f29377e1c (patch) | |
tree | c2af6bd2a212120212ddb17b495637f70eaaeb40 | |
parent | 6704375be64c24137505e05b6312684c3481280f (diff) |
added test_async to cmake and vcxproj
-rw-r--r-- | tests/CMakeLists.txt | 5 | ||||
-rw-r--r-- | tests/tests.vcxproj | 11 | ||||
-rw-r--r-- | tests/tests.vcxproj.filters | 3 |
3 files changed, 12 insertions, 7 deletions
diff --git a/tests/CMakeLists.txt b/tests/CMakeLists.txt index 119fab55..d37f3c4e 100644 --- a/tests/CMakeLists.txt +++ b/tests/CMakeLists.txt @@ -6,8 +6,9 @@ set(SPDLOG_UTESTS_SOURCES errors.cpp file_helper.cpp file_log.cpp - test_misc.cpp - test_pattern_formatter + test_misc.cpp + test_pattern_formatter.cpp + test_async.cpp includes.h registry.cpp test_macros.cpp diff --git a/tests/tests.vcxproj b/tests/tests.vcxproj index 286c6979..4565f197 100644 --- a/tests/tests.vcxproj +++ b/tests/tests.vcxproj @@ -1,5 +1,5 @@ <?xml version="1.0" encoding="utf-8"?>
-<Project DefaultTargets="Build" ToolsVersion="14.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+<Project DefaultTargets="Build" ToolsVersion="15.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
<ItemGroup Label="ProjectConfigurations">
<ProjectConfiguration Include="Debug|Win32">
<Configuration>Debug</Configuration>
@@ -27,26 +27,26 @@ <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">
<ConfigurationType>Application</ConfigurationType>
<UseDebugLibraries>true</UseDebugLibraries>
- <PlatformToolset>v140</PlatformToolset>
+ <PlatformToolset>v141</PlatformToolset>
<CharacterSet>MultiByte</CharacterSet>
</PropertyGroup>
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="Configuration">
<ConfigurationType>Application</ConfigurationType>
<UseDebugLibraries>true</UseDebugLibraries>
- <PlatformToolset>v140</PlatformToolset>
+ <PlatformToolset>v141</PlatformToolset>
<CharacterSet>MultiByte</CharacterSet>
</PropertyGroup>
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration">
<ConfigurationType>Application</ConfigurationType>
<UseDebugLibraries>false</UseDebugLibraries>
- <PlatformToolset>v140</PlatformToolset>
+ <PlatformToolset>v141</PlatformToolset>
<WholeProgramOptimization>true</WholeProgramOptimization>
<CharacterSet>MultiByte</CharacterSet>
</PropertyGroup>
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="Configuration">
<ConfigurationType>Application</ConfigurationType>
<UseDebugLibraries>false</UseDebugLibraries>
- <PlatformToolset>v140</PlatformToolset>
+ <PlatformToolset>v141</PlatformToolset>
<WholeProgramOptimization>true</WholeProgramOptimization>
<CharacterSet>MultiByte</CharacterSet>
</PropertyGroup>
@@ -129,6 +129,7 @@ <ClCompile Include="errors.cpp" />
<ClCompile Include="file_helper.cpp" />
<ClCompile Include="file_log.cpp" />
+ <ClCompile Include="test_async.cpp" />
<ClCompile Include="test_misc.cpp" />
<ClCompile Include="main.cpp" />
<ClCompile Include="registry.cpp" />
diff --git a/tests/tests.vcxproj.filters b/tests/tests.vcxproj.filters index d1fdf73d..c70cc496 100644 --- a/tests/tests.vcxproj.filters +++ b/tests/tests.vcxproj.filters @@ -42,6 +42,9 @@ <ClCompile Include="test_misc.cpp">
<Filter>Source Files</Filter>
</ClCompile>
+ <ClCompile Include="test_async.cpp">
+ <Filter>Source Files</Filter>
+ </ClCompile>
</ItemGroup>
<ItemGroup>
<ClInclude Include="includes.h">
|