XITRIX/MeloNX
1
0
Fork 0
forked from MeloNX/MeloNX
Code Pull Requests Activity

Find nmake on Windows using vswhere

Browse Source
This commit is contained in:
TSR Berry 2024-05-02 02:52:52 +02:00 committed by Emmanuel Hansen
parent 9bcc48646a
commit d19b391ca6
1 changed files with 16 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
src/RyujinxAndroid/libryujinx/libs/OpenSSL.cmake
View File

@ -1,11 +1,24 @@
include(ExternalProject) include(ExternalProject)
find_program(MAKE_COMMAND NAMES nmake make REQUIRED)
find_package(Perl 5 REQUIRED) find_package(Perl 5 REQUIRED)
set(PROJECT_ENV "ANDROID_NDK_ROOT=${CMAKE_ANDROID_NDK}") set(PROJECT_ENV "ANDROID_NDK_ROOT=${CMAKE_ANDROID_NDK}")
if (CMAKE_HOST_WIN32) if (CMAKE_HOST_WIN32)
set(ProgramFiles_x86 "$ENV{ProgramFiles\(x86\)}")
# https://github.com/microsoft/vswhere/wiki/Find-MSBuild
cmake_path(APPEND VSWHERE_BIN "${ProgramFiles_x86}" "Microsoft Visual Studio" "Installer" "vswhere.exe")
# FIXME: Hardcoded architecture, no way to specify the MSVC version
execute_process(
COMMAND ${VSWHERE_BIN} "-latest" "-find" "VC\\Tools\\MSVC\\*\\bin\\Hostx64\\x64\\nmake.exe"
OUTPUT_VARIABLE NMAKE_PATHS_OUTPUT
OUTPUT_STRIP_TRAILING_WHITESPACE
COMMAND_ERROR_IS_FATAL ANY
)
string(REPLACE "\n" ";" NMAKE_PATH_LIST "${NMAKE_PATHS_OUTPUT}")
list(GET NMAKE_PATH_LIST 0 NMAKE_PATH)
cmake_path(NATIVE_PATH NMAKE_PATH NORMALIZE MAKE_COMMAND)
set(PROJECT_CFG_PREFIX ${PERL_EXECUTABLE}) set(PROJECT_CFG_PREFIX ${PERL_EXECUTABLE})
# Deal with semicolon-separated lists # Deal with semicolon-separated lists
set(PROJECT_PATH_LIST $ENV{Path}) set(PROJECT_PATH_LIST $ENV{Path})
@ -16,9 +29,11 @@ if (CMAKE_HOST_WIN32)
# Add the modified PATH string to PROJECT_ENV # Add the modified PATH string to PROJECT_ENV
list(APPEND PROJECT_ENV "Path=${PROJECT_PATH_STRING}") list(APPEND PROJECT_ENV "Path=${PROJECT_PATH_STRING}")
elseif (CMAKE_HOST_UNIX) elseif (CMAKE_HOST_UNIX)
find_program(MAKE_COMMAND NAMES make REQUIRED)
list(APPEND PROJECT_ENV "PATH=${ANDROID_TOOLCHAIN_ROOT}/bin:$ENV{PATH}") list(APPEND PROJECT_ENV "PATH=${ANDROID_TOOLCHAIN_ROOT}/bin:$ENV{PATH}")
else () else ()
message(WARNING "Host system (${CMAKE_HOST_SYSTEM_NAME}) not supported. Treating as unix.") message(WARNING "Host system (${CMAKE_HOST_SYSTEM_NAME}) not supported. Treating as unix.")
find_program(MAKE_COMMAND NAMES make REQUIRED)
list(APPEND PROJECT_ENV "PATH=${ANDROID_TOOLCHAIN_ROOT}/bin:$ENV{PATH}") list(APPEND PROJECT_ENV "PATH=${ANDROID_TOOLCHAIN_ROOT}/bin:$ENV{PATH}")
endif () endif ()