Skip to content
Snippets Groups Projects
Commit 06692f4d authored by Administrator's avatar Administrator
Browse files

Fix compilation problem with external package Hal

Fixes the problem also when passing path info as CMake parameters for
FairSoft/FairRoot apr21p2/v18.6.7.

The solution now works for CMake parameters as well as for environment variables
for bost FairSoft/FairRoot combinations apr21p2/v18.6.7 and nov22p1/v18.8.0.

MR 1680
(cherry picked from commit 3fd35831)
parent 0ce4a26e
No related branches found
No related tags found
No related merge requests found
......@@ -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})
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment