catch3
Progmasoft Catch3: an independently maintained C++17 test framework with a parallel runner, property checks, snapshots and structured results.
Clonegit clone https://git.progmasoft.com/catch3
Fix VS2017 approvals on AppVeyor
- Commit
52029935557516c6af58c007879aaabfaa742a3a- Author
- Martin Hořeňovský ·
- Parents
f061dabbada3
Changes
misc/SelfTest.vcxproj.user | 23 +++++++++++++++++++++++ projects/CMakeLists.txt | 12 ++++++++++++ 2 files changed, 35 insertions(+) diff --git a/misc/SelfTest.vcxproj.user b/misc/SelfTest.vcxproj.user new file mode 100644 index 00000000..ffffc575 --- /dev/null +++ b/misc/SelfTest.vcxproj.user @@ -0,0 +1,23 @@ +<?xml version="1.0" encoding="utf-8"?> +<Project ToolsVersion="15.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003"> + <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'"> + <ClCompile> + <UseFullPaths>false</UseFullPaths> + </ClCompile> + </ItemDefinitionGroup> + <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'"> + <ClCompile> + <UseFullPaths>false</UseFullPaths> + </ClCompile> + </ItemDefinitionGroup> + <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'"> + <ClCompile> + <UseFullPaths>false</UseFullPaths> + </ClCompile> + </ItemDefinitionGroup> + <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'"> + <ClCompile> + <UseFullPaths>false</UseFullPaths> + </ClCompile> + </ItemDefinitionGroup> +</Project> diff --git a/projects/CMakeLists.txt b/projects/CMakeLists.txt index d535eec0..f83d2bfb 100644 --- a/projects/CMakeLists.txt +++ b/projects/CMakeLists.txt @@ -1,5 +1,17 @@ include(MiscFunctions) +#### +# Temporary workaround for VS toolset changes in 2017 +# We need to disable <UseFullPaths> property, but CMake doesn't support it +# until 3.13 (not yet released) +#### +if (MSVC) +configure_file(${CATCH_DIR}/misc/SelfTest.vcxproj.user + ${CMAKE_BINARY_DIR}/projects + COPYONLY) +endif(MSVC) #Temporary workaround + + # define the sources of the self test # Please keep these ordered alphabetically set(TEST_SOURCES