diff --git a/external/Hal.patch b/external/Hal.patch index b9b1213ca71e0874a1844394c520bbec1fa37a2a..09dcb8a2221391e8bd9101ff658ab347ff6dc786 100644 --- a/external/Hal.patch +++ b/external/Hal.patch @@ -62,10 +62,10 @@ index 1fad98c..19a3290 100644 Set(Boost_NO_BOOST_CMAKE TRUE) Set(BOOST_ROOT ${SIMPATH}) diff --git a/cmake/modules/HalMacros.cmake b/cmake/modules/HalMacros.cmake -index c48a4ca..284a5a9 100644 +index c48a4ca..19e60d0 100644 --- a/cmake/modules/HalMacros.cmake +++ b/cmake/modules/HalMacros.cmake -@@ -8,15 +8,17 @@ Macro(SetFairBase) +@@ -8,15 +8,20 @@ Macro(SetFairBase) SET(FAIRBASE ${FAIRBASE}) Else (FAIRBASE) Message(STATUS "NOT Found FAIRBASE") @@ -79,6 +79,9 @@ index c48a4ca..284a5a9 100644 + endif() + if(NOT FAIRROOTPATH) + SET(FAIRROOTPATH $ENV{FAIRROOTPATH}) ++ endif() ++ if(NOT ENV{FAIRROOTPATH}) ++ SET(ENV{FAIRROOTPATH} ${FAIRROOTPATH}) + endif() EndIf (FAIRBASE) - set(CMAKE_MODULE_PATH "$ENV{FAIRROOTPATH}/share/fairbase/cmake/modules_old" ${CMAKE_MODULE_PATH})