Set platform architecture using CMake's -A option

Introduced in CMake v3.1.0, I think it's a bit easier to remember than a
suffix on the generator name.
This commit is contained in:
Oliver Hamlet
2019-06-22 13:46:43 +01:00
parent 915c002ca6
commit 937a36a5ae
2 changed files with 3 additions and 3 deletions
+2 -2
View File
@@ -1,5 +1,5 @@
cmake_minimum_required (VERSION 2.8.12)
cmake_minimum_required (VERSION 3.1)
project (loot_api_python)
include(ExternalProject)
@@ -54,7 +54,7 @@ add_subdirectory(${PYBIND11_EXTRACTED_PATH})
#######################################
if (CMAKE_SYSTEM_NAME MATCHES "Windows")
if (NOT "${CMAKE_GENERATOR}" MATCHES "(Win64|IA64)")
if (NOT "${CMAKE_GENERATOR_PLATFORM}" MATCHES "x64")
set(LIBLOOT_URL "https://github.com/loot/libloot/releases/download/0.14.7/libloot-0.14.7-0-g1878d48_dev-win32.7z")
else()
set(LIBLOOT_URL "https://github.com/loot/libloot/releases/download/0.14.7/libloot-0.14.7-0-g1878d48_dev-win64.7z")
+1 -1
View File
@@ -30,7 +30,7 @@ before_build:
if ($env:PLATFORM -eq 'Win32') {
cmake .. -G "Visual Studio 15 2017" -DPYTHON_EXECUTABLE="C:\Python${env:PYTHON_DIRECTORY_VERSION}\python.exe"
} else {
cmake .. -G "Visual Studio 15 2017 Win64" -DPYTHON_EXECUTABLE="C:\Python${env:PYTHON_DIRECTORY_VERSION}-x64\python.exe"
cmake .. -G "Visual Studio 15 2017" -A x64 -DPYTHON_EXECUTABLE="C:\Python${env:PYTHON_DIRECTORY_VERSION}-x64\python.exe"
}
build: