From 514e515b6697db8f8ac1504d1720c85e62b26dcd Mon Sep 17 00:00:00 2001 From: Evgeny Mankov Date: Sat, 16 Sep 2023 20:26:18 +0200 Subject: [PATCH] [HIPIFY][#1021][#1022][build][MSVS][fix][partial] Fix for `error C2365` occurred on VS 2019 with ToT clang 18.0.0git + Widen the range of `MSVC_VERSION` from 1930 (initial version of VS 2022 17.0.0) to 1920 (initial version of VS 2019 16.0.0) + [Reason] Conforming preprocessor is needed for LLVM 18.0.0git on VS 2019 as well + [Details] https://learn.microsoft.com/en-us/cpp/preprocessor/preprocessor-experimental-overview?view=msvc-170 https://learn.microsoft.com/en-us/cpp/preprocessor/preprocessor-experimental-overview?view=msvc-160 --- CMakeLists.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index f00ed430..111877d2 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -140,7 +140,7 @@ if (NOT HIPIFY_CLANG_TESTS_ONLY) if(MSVC) target_link_libraries(hipify-clang PRIVATE version) target_compile_options(hipify-clang PRIVATE ${STD} /Od /GR- /EHs- /EHc-) - if((LLVM_PACKAGE_VERSION VERSION_EQUAL "18.0.0" OR LLVM_PACKAGE_VERSION VERSION_GREATER "18.0.0") AND MSVC_VERSION VERSION_GREATER "1929") + if((LLVM_PACKAGE_VERSION VERSION_EQUAL "18.0.0" OR LLVM_PACKAGE_VERSION VERSION_GREATER "18.0.0") AND MSVC_VERSION VERSION_GREATER "1919") target_compile_options(hipify-clang PRIVATE /Zc:preprocessor) endif() set(CMAKE_CXX_LINK_FLAGS "${CMAKE_CXX_LINK_FLAGS} /SUBSYSTEM:WINDOWS")