From 4a3958d14983999ef3bd3925c42c7d84b692c87c Mon Sep 17 00:00:00 2001 From: momo5502 Date: Sun, 24 Apr 2022 10:49:06 +0200 Subject: [PATCH] Fix ninja builds --- CMakePresets.json | 2 +- external/vcrtl.cmake | 8 +++++++- 2 files changed, 8 insertions(+), 2 deletions(-) diff --git a/CMakePresets.json b/CMakePresets.json index db76638..ff0b0a9 100644 --- a/CMakePresets.json +++ b/CMakePresets.json @@ -11,7 +11,7 @@ "displayName": "Default Release Config", "description": "Release build using Ninja generator", "generator": "Ninja", - "binaryDir": "${sourceDir}/build/default", + "binaryDir": "${sourceDir}/build/release", "cacheVariables": { "CMAKE_BUILD_TYPE": "Release" } diff --git a/external/vcrtl.cmake b/external/vcrtl.cmake index 070516b..05ed993 100644 --- a/external/vcrtl.cmake +++ b/external/vcrtl.cmake @@ -1,4 +1,10 @@ -set(VCRTL_LIBRARY "${CMAKE_CURRENT_BINARY_DIR}/vcrtl/$/vcrtl_driver.lib") +get_property(IS_MULTI_CONFIG GLOBAL PROPERTY GENERATOR_IS_MULTI_CONFIG) + +if(IS_MULTI_CONFIG) + set(VCRTL_LIBRARY "${CMAKE_CURRENT_BINARY_DIR}/vcrtl/$/vcrtl_driver.lib") +else() + set(VCRTL_LIBRARY "${CMAKE_CURRENT_BINARY_DIR}/vcrtl/vcrtl_driver.lib") +endif() ExternalProject_Add( vcrtl_build