From b7084fef4c850d0352488b14dcff0f36a7e75e1c Mon Sep 17 00:00:00 2001 From: Christian Clason Date: Sat, 25 Jun 2022 13:45:20 +0200 Subject: [PATCH] fix(build): strip trailing newline from variable (#19084) Problem: #19029 added a new fallback that sets `$MACOSX_DEPLOYMENT_TARGET` to the local macOS version via `sw_vers`. However, the output included a newline, which broke the generated Ninja build script. Solution: use `OUTPUT_STRIP_TRAILING_WHITESPACE` for `execute_process`. --- third-party/cmake/BuildLuajit.cmake | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/third-party/cmake/BuildLuajit.cmake b/third-party/cmake/BuildLuajit.cmake index 23422f2708..c8d5b39398 100644 --- a/third-party/cmake/BuildLuajit.cmake +++ b/third-party/cmake/BuildLuajit.cmake @@ -64,7 +64,9 @@ if(CMAKE_SYSTEM_NAME STREQUAL "Darwin") if(CMAKE_OSX_DEPLOYMENT_TARGET) set(DEPLOYMENT_TARGET "MACOSX_DEPLOYMENT_TARGET=${CMAKE_OSX_DEPLOYMENT_TARGET}") else() - execute_process(COMMAND sw_vers -productVersion OUTPUT_VARIABLE MACOS_VERSION) + execute_process(COMMAND sw_vers -productVersion + OUTPUT_VARIABLE MACOS_VERSION + OUTPUT_STRIP_TRAILING_WHITESPACE) set(DEPLOYMENT_TARGET "MACOSX_DEPLOYMENT_TARGET=${MACOS_VERSION}") endif() else()