Skip to content

Commit d4c4720

Browse files
committed
refactor: Use CMAKE_LANG_COMPILER_ARCHITECTURE_ID
1 parent 86773ff commit d4c4720

File tree

1 file changed

+4
-4
lines changed

1 file changed

+4
-4
lines changed

conan.cmake

+4-4
Original file line numberDiff line numberDiff line change
@@ -224,15 +224,15 @@ macro(_conan_detect_compiler)
224224

225225
# Detect 'arch'
226226
if(NOT _CONAN_SETTING_ARCH)
227-
if (MSVC_${LANGUAGE}_ARCHITECTURE_ID MATCHES "64")
227+
if (CMAKE_${LANGUAGE}_COMPILER_ARCHITECTURE_ID MATCHES "64")
228228
set(_CONAN_SETTING_ARCH x86_64)
229-
elseif (MSVC_${LANGUAGE}_ARCHITECTURE_ID MATCHES "^ARM")
229+
elseif (CMAKE_${LANGUAGE}_COMPILER_ARCHITECTURE_ID MATCHES "^ARM")
230230
message(STATUS "Conan: Using default ARM architecture from MSVC")
231231
set(_CONAN_SETTING_ARCH armv6)
232-
elseif (MSVC_${LANGUAGE}_ARCHITECTURE_ID MATCHES "86")
232+
elseif (CMAKE_${LANGUAGE}_COMPILER_ARCHITECTURE_ID MATCHES "86")
233233
set(_CONAN_SETTING_ARCH x86)
234234
else ()
235-
message(FATAL_ERROR "Conan: Unknown MSVC architecture [${MSVC_${LANGUAGE}_ARCHITECTURE_ID}]")
235+
message(FATAL_ERROR "Conan: Unknown MSVC architecture [${CMAKE_${LANGUAGE}_COMPILER_ARCHITECTURE_ID}]")
236236
endif()
237237
endif()
238238

0 commit comments

Comments
 (0)