From 77cfdfffa6f091d272289f7e437b116b1fd385a4 Mon Sep 17 00:00:00 2001 From: "Bruce B. Lacey" Date: Sun, 9 Oct 2016 10:08:34 -0700 Subject: [PATCH] Fix FindNETGEN.cmake to properly set netgen search path to HOMEBREW_PREFIX, when using homebrew, instead of the netgen cellar --- .travis.yml | 3 --- cMake/FindNETGEN.cmake | 2 +- 2 files changed, 1 insertion(+), 4 deletions(-) diff --git a/.travis.yml b/.travis.yml index 3d61d1cae..a5983e4f8 100755 --- a/.travis.yml +++ b/.travis.yml @@ -142,9 +142,6 @@ before_install: #Remove GDAL if installed because it results in non-existent dependent library exceptions if [ -e /usr/local/lib/libgdal.1.dylib ]; then brew unlink gdal; fi - #Remove conflicting nglib formula that confuses cmake - rm $(brew --repository homebrew/science)/nglib.rb - export CMAKE_ARGS="${CMAKE_OPTS} -DFREECAD_USE_EXTERNAL_KDL=ON -DFREECAD_CREATE_MAC_APP=ON" export INSTALLED_APP_PATH="/usr/local/FreeCAD.app/Contents/bin/FreeCAD" ;; diff --git a/cMake/FindNETGEN.cmake b/cMake/FindNETGEN.cmake index c2b483cf8..e06cd3425 100644 --- a/cMake/FindNETGEN.cmake +++ b/cMake/FindNETGEN.cmake @@ -18,7 +18,7 @@ IF(DEFINED MACPORTS_PREFIX OR DEFINED HOMEBREW_PREFIX) # We haven't supported Netgen prior to 5.3.1 on MacOS, and the current # plan is for the next Netgen version to be 6.1 (currently unreleased). IF(DEFINED HOMEBREW_PREFIX) - EXEC_PROGRAM(brew ARGS --prefix nglib OUTPUT_VARIABLE NGLIB_PREFIX) + SET(NGLIB_PREFIX ${HOMEBREW_PREFIX}) ELSE(DEFINED HOMEBREW_PREFIX) SET(NGLIB_PREFIX ${MACPORTS_PREFIX}) ENDIF(DEFINED HOMEBREW_PREFIX)