Skip to content

Commit 340f9d9

Browse files
committed
fix: fix checking for VCVARSALL_FILE existence
1 parent 03c09d5 commit 340f9d9

2 files changed

Lines changed: 5 additions & 6 deletions

File tree

README.md

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -17,10 +17,10 @@ cmake_minimum_required(VERSION 3.16)
1717
# You can later set fine-grained standards for each target using `target_compile_features`
1818
# set(CMAKE_CXX_STANDARD 17)
1919
20-
# Add ProjectOptions v0.11.0
20+
# Add ProjectOptions v0.11.1
2121
# https://github.com/aminya/ProjectOptions
2222
include(FetchContent)
23-
FetchContent_Declare(projectoptions URL https://github.com/aminya/ProjectOptions/archive/refs/tags/v0.11.0.zip)
23+
FetchContent_Declare(projectoptions URL https://github.com/aminya/ProjectOptions/archive/refs/tags/v0.11.1.zip)
2424
FetchContent_MakeAvailable(projectoptions)
2525
include(${projectoptions_SOURCE_DIR}/Index.cmake)
2626
@@ -139,10 +139,10 @@ cmake_minimum_required(VERSION 3.16)
139139
# You can later set fine-grained standards for each target using `target_compile_features`
140140
# set(CMAKE_CXX_STANDARD 17)
141141
142-
# Add ProjectOptions v0.11.0
142+
# Add ProjectOptions v0.11.1
143143
# https://github.com/aminya/ProjectOptions
144144
include(FetchContent)
145-
FetchContent_Declare(projectoptions URL https://github.com/aminya/ProjectOptions/archive/refs/tags/v0.11.0.zip)
145+
FetchContent_Declare(projectoptions URL https://github.com/aminya/ProjectOptions/archive/refs/tags/v0.11.1.zip)
146146
FetchContent_MakeAvailable(projectoptions)
147147
include(${projectoptions_SOURCE_DIR}/Index.cmake)
148148

src/VCEnvironment.cmake

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -17,8 +17,7 @@ function(run_vcvarsall)
1717
"${MSVC_DIR}/../../../../../../.."
1818
PATH_SUFFIXES "VC/Auxiliary/Build" "Common7/Tools" "Tools")
1919

20-
if(VCVARSALL_FILE_FOUND)
21-
20+
if(EXISTS ${VCVARSALL_FILE})
2221
# detect the architecture
2322
string(TOLOWER "${CMAKE_SYSTEM_PROCESSOR}" CMAKE_SYSTEM_PROCESSOR_LOWER)
2423
if(CMAKE_SYSTEM_PROCESSOR_LOWER STREQUAL x86 OR CMAKE_SYSTEM_PROCESSOR_LOWER MATCHES "^i[3456]86$")

0 commit comments

Comments
 (0)