From afd7a5e69d4c7ac2d3b4279ed61694c92896d614 Mon Sep 17 00:00:00 2001 From: Stephen Saunders Date: Mon, 21 Jun 2021 19:47:19 -0400 Subject: [PATCH] Improve macOS build robustness re sysroot path spec --- neo/CMakeLists.txt | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/neo/CMakeLists.txt b/neo/CMakeLists.txt index ce595f9a..4d23fee6 100644 --- a/neo/CMakeLists.txt +++ b/neo/CMakeLists.txt @@ -184,8 +184,12 @@ if(CMAKE_COMPILER_IS_GNUCC OR CMAKE_C_COMPILER_ID MATCHES "Clang") if(${CMAKE_SYSTEM_NAME} MATCHES "Darwin") # SRS - Also add -fasm-blocks otherwise Xcode complains add_definitions(-fasm-blocks) + if(CMAKE_OSX_SYSROOT) + add_definitions(-isysroot "${CMAKE_OSX_SYSROOT}") + message(STATUS "Using macOS sysroot: " ${CMAKE_OSX_SYSROOT}) + endif() if(CMAKE_OSX_DEPLOYMENT_TARGET) - add_definitions(-isysroot "${CMAKE_OSX_SYSROOT}" -mmacosx-version-min="${CMAKE_OSX_DEPLOYMENT_TARGET}") + add_definitions(-mmacosx-version-min="${CMAKE_OSX_DEPLOYMENT_TARGET}") endif() endif()