From aa986364e41aede8301b69601af6fd6b51d48ae4 Mon Sep 17 00:00:00 2001 From: Michael Schlottke-Lakemper Date: Mon, 26 Oct 2020 04:40:50 +0100 Subject: [PATCH] Move Xcode paths into MacOS section --- deps/build.jl | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/deps/build.jl b/deps/build.jl index 6ad5970..c6780b2 100644 --- a/deps/build.jl +++ b/deps/build.jl @@ -4,10 +4,6 @@ using MPI import Pkg.TOML import P4est_jll -# Only required on MacOS systems -const xcode_include_path_cli = "/Library/Developer/CommandLineTools/SDKs/MacOSX.sdk/usr/include/" -const xcode_include_path_gui = "/Applications/Xcode.app/Contents/Developer/Platforms/MacOSX.platform/Developer/SDKs/MacOSX.sdk/usr/include/" - # setup configuration using ideas from MPI.jl const config_toml = joinpath(first(DEPOT_PATH), "prefs", "P4est.toml") mkpath(dirname(config_toml)) @@ -158,6 +154,9 @@ end # Workaround for MacOS: The some headers required by p4est (such as `math.h`) are only available via # Xcode if Sys.isapple() + # These two paths *should* - on any reasonably current MacOS system - contain the relevant headers + const xcode_include_path_cli = "/Library/Developer/CommandLineTools/SDKs/MacOSX.sdk/usr/include/" + const xcode_include_path_gui = "/Applications/Xcode.app/Contents/Developer/Platforms/MacOSX.platform/Developer/SDKs/MacOSX.sdk/usr/include/" if !isdir(xcode_include_path_cli) && !isdir(xcode_include_path_gui) error("MacOS SDK include paths ('$xcode_include_path_cli' or '$xcode_include_path_gui') do not exist. Have you installed Xcode?") end