Skip to content
Snippets Groups Projects
Commit e1d56839 authored by Rashad Kanavath's avatar Rashad Kanavath
Browse files

SuperBuild: use cmake boolean to check x86 and x64 compiler arch

parent cb22297d
No related branches found
No related tags found
No related merge requests found
......@@ -15,10 +15,10 @@ if(MSVC)
return()
endif()
if("${OTB_MSVC_COMPILER_ARCH}" MATCHES "x86")
set(CURL_INSTALL_DIR_PREFIX "libcurl-vc-x86")
else()
if(OTB_MSVC_COMPILER_ARCH_IS_X64)
set(CURL_INSTALL_DIR_PREFIX "libcurl-vc-x64")
else()
set(CURL_INSTALL_DIR_PREFIX "libcurl-vc-x86")
endif()
set(CURL_INSTALL_DIR_PREFIX "${CURL_INSTALL_DIR_PREFIX}-release-dll-zlib-dll-ipv6-sspi-winssl")
......
......@@ -95,7 +95,7 @@ else(MSVC)
${CMAKE_SOURCE_DIR}/patches/GDAL/nmake_gdal_extra.opt.in
${CMAKE_BINARY_DIR}/nmake_gdal_extra.opt)
if("${OTB_MSVC_COMPILER_ARCH}" MATCHES "x64")
if(OTB_MSVC_COMPILER_ARCH_IS_X64)
file(APPEND "${CMAKE_BINARY_DIR}/nmake_gdal_extra.opt" "WIN64=YES")
endif()
......
......@@ -30,9 +30,9 @@ if(MSVC)
OUTPUT_QUIET
OUTPUT_STRIP_TRAILING_WHITESPACE)
set(OTB_MSVC_COMPILER_ARCH x64)
set(OTB_MSVC_COMPILER_ARCH_IS_X64 TRUE)
if("${ev}" MATCHES "x86")
set(OTB_MSVC_COMPILER_ARCH x86)
set(OTB_MSVC_COMPILER_ARCH_IS_X64 FALSE)
endif()
endif()
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment