From 0f8feb669cea4d081abe42adfc5433a1f5b2b6b6 Mon Sep 17 00:00:00 2001 From: kearwood Date: Sat, 2 Jul 2022 18:31:48 -0700 Subject: [PATCH] Fix Azure CI, MSVC CMake integration. Update configure batch script to VS 2022 --- configure_win64_msvc.bat | 2 +- tests/smoke/hello_cube/CMakeLists.txt | 3 +-- 2 files changed, 2 insertions(+), 3 deletions(-) diff --git a/configure_win64_msvc.bat b/configure_win64_msvc.bat index ac45098..dac893d 100644 --- a/configure_win64_msvc.bat +++ b/configure_win64_msvc.bat @@ -1,2 +1,2 @@ rem call "%VSINSTALLDIR%VC\Auxiliary\Build\vcvars64.bat" -cmake -H. -G"Visual Studio 16 2019" -Bbuild -DCMAKE_TOOLCHAIN_FILE="toolchain/toolchain-x86_64-pc-windows-msvc.cmake" \ No newline at end of file +cmake -H. -G"Visual Studio 17 2022" -Bbuild -DCMAKE_TOOLCHAIN_FILE="toolchain/toolchain-x86_64-pc-windows-msvc.cmake" \ No newline at end of file diff --git a/tests/smoke/hello_cube/CMakeLists.txt b/tests/smoke/hello_cube/CMakeLists.txt index e820048..e864196 100644 --- a/tests/smoke/hello_cube/CMakeLists.txt +++ b/tests/smoke/hello_cube/CMakeLists.txt @@ -8,8 +8,7 @@ SET(KRAKEN_CUBE_BUNDLE "${CMAKE_BINARY_DIR}/output/tests/kraken_cube.krbundle") add_custom_command( OUTPUT ${KRAKEN_CUBE_BUNDLE} COMMAND kraken_convert -o ${KRAKEN_CUBE_BUNDLE} ${STANDARD_ASSET_BUNDLE} - MAIN_DEPENDENCY ${STANDARD_ASSET_BUNDLE} - DEPENDS kraken_convert kraken_sdk + DEPENDS kraken_convert kraken_sdk standard_assets WORKING_DIRECTORY ${PROJECT_SOURCE_DIR} COMMENT "Creating Cube Test Assets" )