Commit a8fbc4da authored by Michael Turner's avatar Michael Turner

Merge branch 'fix/homebrew-macports-prefix' into 'master'

Small CMake modification to MacPorts and Homebrew detection to fix OCE

This MR fixes Homebrew and MacPorts detection in OCE by unsetting appropriate variables if the installation has not been found. Consequently, OCE detection now works properly for Homebrew.

See merge request !729
parents 24892674 f364292a
......@@ -34,6 +34,7 @@ v4.4.0
- Enabled MUMPS support in PETSc if a Fortran compiler was found and added 3D
support to the Helmholtz smoother used e.g. in FieldConverts C0Projection
module (!714)
- Fix bug in CMake Homebrew and MacPorts detection for OS X (!729)
**ADRSolver:**
- Add a projection equation system for C^0 projections (!675)
......
......@@ -70,13 +70,20 @@ IF (APPLE)
SET(CMAKE_LIBRARY_PATH ${MACPORTS_PREFIX}/lib ${CMAKE_LIBRARY_PATH})
SET(CMAKE_INCLUDE_PATH ${MACPORTS_PREFIX}/include ${CMAKE_INCLUDE_PATH})
MESSAGE(STATUS "Detected MacPorts installation: ${MACPORTS_PREFIX}")
ELSE()
UNSET(MACPORTS_PREFIX)
ENDIF()
IF (${DETECT_HOMEBREW} EQUAL 0)
SET(CMAKE_LIBRARY_PATH ${HOMEBREW_PREFIX}/lib ${CMAKE_LIBRARY_PATH})
SET(CMAKE_INCLUDE_PATH ${HOMEBREW_PREFIX}/include ${CMAKE_INCLUDE_PATH})
MESSAGE(STATUS "Detected Homebrew installation: ${HOMEBREW_PREFIX}")
ELSE()
UNSET(HOMEBREW_PREFIX)
ENDIF()
UNSET(DETECT_HOMEBREW)
UNSET(DETECT_MACPORTS)
ENDIF()
# Attempt to retrieve git branch and SHA1 hash of current changeset.
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment