New deps and use vld option in cmake (#72)

* Update dependencies

* Use vld as cmake option

* Remove vld.props

* Fix cmake display

* Fix mistake in yml file

build/devops_gated.yml

@@ -42,16 +42,16 @@ jobs:
       modifyEnvironment: true
 
   - task: CMake@1
-    displayName: 'CMake .. -Drun_unittests:bool=ON -Drun_int_tests:bool=ON -Duse_cppunittest:bool=OFF -G "Visual Studio 16 2019" -A x64'
+    displayName: 'CMake .. -Drun_reals_check:bool=ON -Drun_unittests:bool=ON -Drun_int_tests:bool=ON -Duse_cppunittest:bool=OFF -Duse_vld:bool=ON -G "Visual Studio 16 2019" -A x64'
     inputs:
       workingDirectory: 'build_x64'
-      cmakeArgs: '.. -Drun_reals_check:bool=ON -Drun_unittests:bool=ON -Drun_int_tests:bool=ON -Duse_cppunittest:bool=OFF -G "Visual Studio 16 2019" -A x64'
+      cmakeArgs: '.. -Drun_reals_check:bool=ON -Drun_unittests:bool=ON -Drun_int_tests:bool=ON -Duse_cppunittest:bool=OFF -Duse_vld:bool=ON -G "Visual Studio 16 2019" -A x64'
 
   - task: VSBuild@1
     displayName: 'Build solution build_x64\*.sln'
     inputs:
       solution: 'build_x64\*.sln'
-      msbuildArgs: '/t:restore /t:build /p:ForceImportBeforeCppTargets=$(Build.SourcesDirectory)/vld.props'
+      msbuildArgs: '/t:restore /t:build'
       platform: x64
       configuration: Debug
       maximumCpuCount: true
@@ -101,7 +101,7 @@ jobs:
       modifyEnvironment: true
 
   - task: CMake@1
-    displayName: 'CMake .. -Drun_unittests:bool=ON -Drun_int_tests:bool=ON -Duse_cppunittest:bool=ON -G "Visual Studio 16 2019" -A x64'
+    displayName: 'CMake .. -Drun_reals_check:bool=ON -Drun_unittests:bool=ON -Drun_int_tests:bool=ON -Duse_cppunittest:bool=ON -G "Visual Studio 16 2019" -A x64'
     inputs:
       workingDirectory: 'build_x64'
       cmakeArgs: '.. -Drun_reals_check:bool=ON -Drun_unittests:bool=ON -Drun_int_tests:bool=ON -Duse_cppunittest:bool=ON -G "Visual Studio 16 2019" -A x64'
@@ -159,7 +159,7 @@ jobs:
       modifyEnvironment: true
 
   - task: CMake@1
-    displayName: CMake
+    displayName: 'CMake .. -Drun_reals_check:bool=ON -Drun_unittests:bool=ON -Drun_int_tests:bool=ON -Drun_e2e_tests:bool=ON -G "Visual Studio 16 2019" -A Win32'
     inputs:
       workingDirectory: 'build_x86'
       cmakeArgs: '.. -Drun_reals_check:bool=ON -Drun_unittests:bool=ON -Drun_int_tests:bool=ON -Drun_e2e_tests:bool=ON -G "Visual Studio 16 2019" -A Win32'
@@ -297,7 +297,7 @@ jobs:
       restoreSolution: deps/c-build-tools/traceabilitytool/traceabilitytool.sln
 
   - task: CMake@1
-    displayName: CMake
+    displayName: 'CMake .. -Ax64'
     inputs:
       workingDirectory: 'build'
       cmakeArgs: '.. -Ax64'

deps/c-build-tools

@@ -1 +1 @@
-Subproject commit 9fb425d533831648673c91410f86844bc6bf036f
+Subproject commit 733f0348ab25c722f062e9b20d9afcfad6bc7371

deps/macro-utils-c

@@ -1 +1 @@
-Subproject commit 9be3f7ede72093b06196fe86c935446c065e31e3
+Subproject commit 4225554bbeb1b66d4eb1991e0fd44dd75933266d

vld.props

@@ -1,15 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Project xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <ItemDefinitionGroup>
-    <ClCompile>
-      <AdditionalOptions>%(AdditionalOptions) /FI "vld.h"</AdditionalOptions>
-      <AdditionalIncludeDirectories>%(AdditionalIncludeDirectories);"c:\Program Files (x86)\Visual Leak Detector\include"</AdditionalIncludeDirectories>
-    </ClCompile>
-    <Link Condition="'$(Platform)' == 'x86'">
-      <AdditionalLibraryDirectories>%(AdditionalLibraryDirectories);"c:\Program Files (x86)\Visual Leak Detector\lib\Win32"</AdditionalLibraryDirectories>
-    </Link>
-    <Link Condition="'$(Platform)' == 'x64'">
-      <AdditionalLibraryDirectories>%(AdditionalLibraryDirectories);"c:\Program Files (x86)\Visual Leak Detector\lib\Win64"</AdditionalLibraryDirectories>
-    </Link>
-  </ItemDefinitionGroup>
-</Project>