From bc2ebaab881dd60eafe3c772c7cc2e1d1de748da Mon Sep 17 00:00:00 2001 From: Luke Street Date: Fri, 11 Jun 2021 16:26:25 -0400 Subject: [PATCH] atdna: Check for VCPKG_TOOLCHAIN, use static LLVM link --- atdna/CMakeLists.txt | 11 +++++++++-- 1 file changed, 9 insertions(+), 2 deletions(-) diff --git a/atdna/CMakeLists.txt b/atdna/CMakeLists.txt index 0f4c9a5..1b872db 100644 --- a/atdna/CMakeLists.txt +++ b/atdna/CMakeLists.txt @@ -101,12 +101,19 @@ target_include_directories(atdna PRIVATE ${CLANG_INCLUDE_DIRS}) # Clang 10.0.x headers currently broken with C++20 set_property(TARGET atdna PROPERTY CXX_STANDARD 17) if(MSVC) - if (NOT VCPKG_TOOLCHAIN) + if (VCPKG_TOOLCHAIN) + # Assumes static build of LLVM + if ("${CMAKE_BUILD_TYPE}" STREQUAL "Debug") + set_property(TARGET atdna PROPERTY MSVC_RUNTIME_LIBRARY "MultiThreadedDebug") + else () + set_property(TARGET atdna PROPERTY MSVC_RUNTIME_LIBRARY "MultiThreaded") + endif () + else () # Allow linking against release-built LLVM libraries target_compile_options(atdna PRIVATE /GR- /D_ITERATOR_DEBUG_LEVEL=0) set_property(TARGET atdna PROPERTY MSVC_RUNTIME_LIBRARY "MultiThreadedDLL") endif () -else() +else () target_compile_options(atdna PRIVATE -fno-rtti -fvisibility=hidden -Wno-error) endif()