From f033bc4ecd5478b4b8c6237bf7ae521ec2961582 Mon Sep 17 00:00:00 2001
From: andriish <andriish@users.noreply.github.com>
Date: Wed, 29 Nov 2023 17:18:54 +0100
Subject: [PATCH 1/2] Update FindPythia6.cmake

Update FindPythia6.cmake
---
 cmake/Modules/FindPythia6.cmake | 12 ++++++++++--
 1 file changed, 10 insertions(+), 2 deletions(-)

diff --git a/cmake/Modules/FindPythia6.cmake b/cmake/Modules/FindPythia6.cmake
index 110e934aa14..19cae710ce3 100644
--- a/cmake/Modules/FindPythia6.cmake
+++ b/cmake/Modules/FindPythia6.cmake
@@ -4,9 +4,17 @@
 # Defines:
 #  PYTHIA6_FOUND
 #  PYTHIA6_LIBRARIES
+set(TEST_PYTHIA6_ROOT_DIR  "" ${PYTHIA6_ROOT_DIR})
+IF(TEST_PYTHIA6_ROOT_DIR STREQUAL "")
+  IF(DEFINED ENV{PYTHIA6_ROOT_DIR})
+    set(PYTHIA6_ROOT_DIR  $ENV{PYTHIA6_ROOT_DIR})
+  else()
+    set(PYTHIA6_ROOT_DIR  "/usr")
+  endif()
+endif()
 
-find_library(PYTHIA6_LIBRARY NAMES Pythia6 pythia6-$ENV{PYTHIA6_VERSION}
-			     HINTS $ENV{PYTHIA6} $ENV{PYTHIA6}/lib)
+find_library(PYTHIA6_LIBRARY NAMES Pythia6 pythia6 pythia6-$ENV{PYTHIA6_VERSION}
+			     HINTS $ENV{PYTHIA6} $ENV{PYTHIA6}/lib $ENV{PYTHIA6}/lib64 ${PYTHIA8_ROOT_DIR}/lib ${PYTHIA8_ROOT_DIR}/lib64)
 
 set(PYTHIA6_LIBRARIES ${PYTHIA6_LIBRARY})                              
 #message(STATUS PYTHIA6_LIBRARIES ${PYTHIA6_LIBRARIES} )

From 65a9b6992b2860f00bf809316b21ffc2818b0cfd Mon Sep 17 00:00:00 2001
From: andriish <andriish@users.noreply.github.com>
Date: Tue, 12 Mar 2024 12:28:03 +0100
Subject: [PATCH 2/2] Update FindPythia6.cmake

---
 cmake/Modules/FindPythia6.cmake | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/cmake/Modules/FindPythia6.cmake b/cmake/Modules/FindPythia6.cmake
index 19cae710ce3..b4f115bfaf0 100644
--- a/cmake/Modules/FindPythia6.cmake
+++ b/cmake/Modules/FindPythia6.cmake
@@ -14,7 +14,7 @@ IF(TEST_PYTHIA6_ROOT_DIR STREQUAL "")
 endif()
 
 find_library(PYTHIA6_LIBRARY NAMES Pythia6 pythia6 pythia6-$ENV{PYTHIA6_VERSION}
-			     HINTS $ENV{PYTHIA6} $ENV{PYTHIA6}/lib $ENV{PYTHIA6}/lib64 ${PYTHIA8_ROOT_DIR}/lib ${PYTHIA8_ROOT_DIR}/lib64)
+			     HINTS $ENV{PYTHIA6} $ENV{PYTHIA6}/lib $ENV{PYTHIA6}/lib64 ${PYTHIA6_ROOT_DIR}/lib ${PYTHIA6_ROOT_DIR}/lib64)
 
 set(PYTHIA6_LIBRARIES ${PYTHIA6_LIBRARY})                              
 #message(STATUS PYTHIA6_LIBRARIES ${PYTHIA6_LIBRARIES} )