From 084091e858ebf5a255e0821549f49bf4c360fc37 Mon Sep 17 00:00:00 2001
From: Stephen Fegan <sfegan@gmail.com>
Date: Fri, 7 Mar 2025 06:02:19 +0100
Subject: [PATCH] Add more libraries. Compiles now on my laptop

---
 CMakeModules/FindCORSIKA8.cmake              | 16 ++++++++++++----
 src/simulation/corsika8_shower_generator.cpp |  8 --------
 2 files changed, 12 insertions(+), 12 deletions(-)

diff --git a/CMakeModules/FindCORSIKA8.cmake b/CMakeModules/FindCORSIKA8.cmake
index 260d5bfb..f9a667f2 100644
--- a/CMakeModules/FindCORSIKA8.cmake
+++ b/CMakeModules/FindCORSIKA8.cmake
@@ -17,11 +17,14 @@ find_library ( EPOS_LIBRARY PATH_SUFFIXES corsika NAMES EPOS_static HINTS ${CORS
 find_library ( QGSJET_LIBRARY PATH_SUFFIXES corsika NAMES QGSJetII_static HINTS ${CORSIKA8_DIR} )
 find_library ( SIBYLL_LIBRARY PATH_SUFFIXES corsika NAMES Sibyll HINTS ${CORSIKA8_DIR} )
 find_library ( PYTHIA8_LIBRARY PATH_SUFFIXES corsika NAMES pythia8 HINTS ${CORSIKA8_DIR} )
+find_library ( URQMD_LIBRARY PATH_SUFFIXES corsika NAMES UrQMD_static HINTS ${CORSIKA8_DIR} )
+find_library ( SOPHIA_LIBRARY PATH_SUFFIXES corsika NAMES Sophia HINTS ${CORSIKA8_DIR} )
 find_library ( CUBIC_INTERPOLATION_LIBRARY NAMES CubicInterpolation HINTS ${CORSIKA8_DIR} )
 find_library ( SPDLOG_LIBRARY NAMES spdlog HINTS ${CORSIKA8_DIR} )
 find_library ( FMT_LIBRARY NAMES fmt HINTS ${CORSIKA8_DIR} )
-find_library ( YAML_LIBRARY NAMES yaml-cpp HINTS ${CORSIKA8_DIR} )
-find_library ( BZ2_LIBRARY NAMES bz2 HINTS ${CORSIKA8_DIR} )
+find_library ( YAML_CPP_LIBRARY NAMES yaml-cpp HINTS ${CORSIKA8_DIR} )
+find_library ( YAML_LIBRARY NAMES yaml HINTS ${CORSIKA8_DIR} )
+# find_library ( BZ2_LIBRARY NAMES -lbz2 HINTS ${CORSIKA8_DIR} )
 find_library ( GFORTRAN_LIBRARY NAMES gfortran HINTS ${CORSIKA8_DIR} /opt/local/lib/gcc13 )
 
 set ( CORSIKA8_LIBRARIES 
@@ -31,11 +34,14 @@ set ( CORSIKA8_LIBRARIES
         ${QGSJET_LIBRARY}
         ${SIBYLL_LIBRARY}
         ${PYTHIA8_LIBRARY}
+        ${URQMD_LIBRARY}
+        ${SOPHIA_LIBRARY}
         ${CUBIC_INTERPOLATION_LIBRARY} 
         ${SPDLOG_LIBRARY}
         ${FMT_LIBRARY}
+        ${YAML_CPP_LIBRARY}
         ${YAML_LIBRARY}
-        ${BZ2_LIBRARY}
+        -lbz2
         ${GFORTRAN_LIBRARY} )
 set ( CORSIKA8_INCLUDE_DIRS ${CORSIKA8_INCLUDE_DIR} )
 
@@ -49,10 +55,12 @@ find_package_handle_standard_args( CORSIKA8 DEFAULT_MSG
         QGSJET_LIBRARY
         SIBYLL_LIBRARY
         PYTHIA8_LIBRARY
+        URQMD_LIBRARY
+        SOPHIA_LIBRARY
         CUBIC_INTERPOLATION_LIBRARY 
         SPDLOG_LIBRARY 
         FMT_LIBRARY 
+        YAML_CPP_LIBRARY
         YAML_LIBRARY 
-        BZ2_LIBRARY
         GFORTRAN_LIBRARY
         CORSIKA8_INCLUDE_DIR )
diff --git a/src/simulation/corsika8_shower_generator.cpp b/src/simulation/corsika8_shower_generator.cpp
index 5609ef25..39ded5c6 100644
--- a/src/simulation/corsika8_shower_generator.cpp
+++ b/src/simulation/corsika8_shower_generator.cpp
@@ -78,11 +78,3 @@ CORSIKA8ShowerGenerator::config_type CORSIKA8ShowerGenerator::default_config()
 
   return config;
 }
-
-// #ifndef CALIN_HAVE_CORSIKA8
-CORSIKA8ShowerGenerator* CORSIKA8ShowerGenerator::new_instance(const config_type& config)
-{
-  throw std::runtime_error("CORSIKA8ShowerGenerator::new_instance not implemented");
-  return nullptr;
-}
-// #endif
\ No newline at end of file