File tree 3 files changed +4
-134
lines changed
3 files changed +4
-134
lines changed Original file line number Diff line number Diff line change 60
60
{
61
61
"name" : " linux-tiles-sounds-x64-vcpkg" ,
62
62
"configurePreset" : " linux-tiles-sounds-x64-vcpkg"
63
+ },
64
+ {
65
+ "name" : " windows-tiles-sounds-x64-msvc" ,
66
+ "configurePreset" : " windows-tiles-sounds-x64-msvc"
63
67
}
64
68
],
65
69
"testPresets" : [
Load Diff This file was deleted.
Original file line number Diff line number Diff line change @@ -7,9 +7,6 @@ Pre-load script for Microsoft Visual Studio builds.
7
7
8
8
Used by CMakePresets.json -> "cacheVariables" -> "CMAKE_PROJECT_INCLUDE_BEFORE".
9
9
10
- When CMake does not run under VS environment, it sources the VsDevCmd.bat on it own.
11
- It then writes CMakeUserPresets.json -> "buildPresets" -> "environment"
12
-
13
10
#]=======================================================================]
14
11
15
12
# Ref https://github.com/actions/virtual-environments/blob/win19/20220515.1/images/win/Windows2019-Readme.md#environment-variables
@@ -20,19 +17,3 @@ endif()
20
17
if ("$ENV{VCPKG_ROOT} " STREQUAL "" AND WIN32 )
21
18
set (ENV{VCPKG_ROOT} $CACHE{VCPKG_ROOT} )
22
19
endif ()
23
-
24
- include (${CMAKE_SOURCE_DIR} /build -scripts/VsDevCmd.cmake)
25
-
26
- # It's fine to keep @_MSVC_DEVENV@ undefined
27
- set (BUILD_PRESET_NAME "windows-tiles-sounds-x64-msvc" )
28
- set (CONFIGURE_PRESET "windows-tiles-sounds-x64-msvc" )
29
- configure_file (
30
- ${CMAKE_SOURCE_DIR} /build -scripts/CMakeUserPresets.json.in
31
- ${CMAKE_SOURCE_DIR} /CMakeUserPresets.json
32
- @ONLY
33
- )
34
-
35
- # Ninja is provided by Microsoft but not in the Path
36
- if (CMAKE_GENERATOR MATCHES "^Ninja" )
37
- set (CMAKE_MAKE_PROGRAM $ENV{DevEnvDir} \\CommonExtensions\\Microsoft\\CMake\\Ninja\\ninja.exe CACHE PATH "" )
38
- endif ()
You can’t perform that action at this time.
0 commit comments