From 4c82068adb046eee3573984392a0d1e774062ae0 Mon Sep 17 00:00:00 2001 From: Jeremy Koritzinsky Date: Thu, 6 Jun 2019 14:43:54 -0700 Subject: Use CMake's C# support to build DacTableGen instead of manually invoking csc.exe ourselves. (#24342) * Use CMake's C# support to build DacTableGen instead of manually invoking csc.exe ourselves. * Fix x86 failures. * Disable DAC generation when building with NMake Makefiles and issue an error since the CMake C# support is VS-only. We don't actually support building with NMake (only configure) so this is ok. * Clean up rest of the macro=1's PR Feedback. * Fix Visual Studio generator matching. * Explicitly specify anycpu32bitpreferred for DacTableGen so the ARM64 build doesn't accidentally make it 64-bit * Fix bad merge --- tests/CMakeLists.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'tests/CMakeLists.txt') diff --git a/tests/CMakeLists.txt b/tests/CMakeLists.txt index 937ecd30cc..665b368746 100644 --- a/tests/CMakeLists.txt +++ b/tests/CMakeLists.txt @@ -5,7 +5,7 @@ cmake_policy(SET CMP0042 NEW) set(INC_PLATFORM_DIR ${CMAKE_CURRENT_SOURCE_DIR}/src/Common/Platform) if (WIN32) - add_definitions(-DWINDOWS=1) + add_definitions(-DWINDOWS) endif() # Verify that LTCG/LTO is available -- cgit v1.2.3