Merge branch 'master' of https://github.com/ncar/eol_scons

NCAR · Jan 27, 2025 · 79d67b1 · 79d67b1
2 parents ebc4b74 + 181afa3
commit 79d67b1
Show file tree

Hide file tree

Showing 4 changed files with 9 additions and 8 deletions.
diff --git a/eol_scons/parseconfig.py b/eol_scons/parseconfig.py
@@ -217,7 +217,7 @@ def ParseConfig(env: Environment, command: str, function=None, unique=True):
 
 
 def _search_paths():
-    search_prefixes = ['/usr', '/usr/local', '/opt/homebrew', '/ucrt64']
+    search_prefixes = ['/usr', '/usr/local', '/ucrt64']
     search_paths = [os.path.join(p, "bin") for p in search_prefixes]
     return search_paths
 

diff --git a/eol_scons/tool.py b/eol_scons/tool.py
@@ -330,6 +330,10 @@ def generate(env, **_kw):
     env.LogDebug("Generating eol defaults for Environment(%s) @ %s" % 
                  (name, env.Dir('#').get_abspath()))
 
+    # Add homebrew tool if we are on a Mac.
+    if env['PLATFORM'] == 'darwin':
+      env.Tool('homebrew')
+
     # Internal includes need to be setup *before* OptPrefixSetup or any
     # other includes, so that scons will scan for headers locally first.
     # Otherwise it looks in the opt prefix include first, and it notices

diff --git a/eol_scons/tools/qt6.py b/eol_scons/tools/qt6.py
@@ -435,9 +435,7 @@ def generate(env):
 
     # MacOS specifics.  Qt6 pkg-config files are in a non-standard location.
     if env['PLATFORM'] == "darwin":
-      brewPath = subprocess.run(['brew', '--prefix'], capture_output=True, text=True).stdout.strip()
-      env.AppendUnique(FRAMEWORKPATH=[brewPath + '/Frameworks',])
-      env.PrependENVPath('PKG_CONFIG_PATH', brewPath + '/opt/qt/libexec/lib/pkgconfig')
+      env.PrependENVPath('PKG_CONFIG_PATH', env['BREW_PREFIX'] + '/opt/qt/libexec/lib/pkgconfig')
 
 
     # Try to find the Qt6 installation location, trying in order:

diff --git a/eol_scons/tools/qwt.py b/eol_scons/tools/qwt.py
@@ -19,14 +19,13 @@ def generate(env):
       qwtpcname = 'Qt5Qwt6'
 
     if env['PLATFORM'] == 'darwin':
-      brewPath = subprocess.run(['brew', '--prefix'], capture_output=True, text=True).stdout.strip()
-      qwtPcPath = brewPath + '/opt/qwt/lib/pkgconfig'
-      qtPcPath = brewPath + '/opt/qt/libexec/lib/pkgconfig'
+      qwtPcPath = env['BREW_PREFIX'] + '/opt/qwt/lib/pkgconfig'
+      qtPcPath = env['BREW_PREFIX'] + '/opt/qt/libexec/lib/pkgconfig'
 
       env.PrependENVPath('PKG_CONFIG_PATH', qtPcPath)
       env.PrependENVPath('PKG_CONFIG_PATH', qwtPcPath)
       # I feel we shouldn't need to add this, but pkg-config is not returning it.
-      env.AppendUnique(CPPPATH=brewPath+'/opt/qwt/lib/qwt.framework/Headers')
+      env.AppendUnique(CPPPATH=env['BREW_PREFIX']+'/opt/qwt/lib/qwt.framework/Headers')
 
 
     pc.ParseConfig(env, 'pkg-config --cflags --libs ' + qwtpcname)