IAP GITLAB

Skip to content
Snippets Groups Projects
Commit 2863f363 authored by Ralf M Ulrich's avatar Ralf M Ulrich
Browse files

fixed merging mess

parent 83f7c6e0
No related branches found
No related tags found
1 merge request!199Resolve "remove examples from coverage"
Pipeline #1334 failed
...@@ -15,34 +15,12 @@ CORSIKA_ADD_EXAMPLE (logger_example) ...@@ -15,34 +15,12 @@ CORSIKA_ADD_EXAMPLE (logger_example)
target_link_libraries (logger_example CORSIKAunits CORSIKAlogging) target_link_libraries (logger_example CORSIKAunits CORSIKAlogging)
install (TARGETS logger_example DESTINATION share/examples) install (TARGETS logger_example DESTINATION share/examples)
CORSIKA_ADD_EXAMPLE (stack_example stack_example.cc) CORSIKA_ADD_EXAMPLE (stack_example)
target_link_libraries (stack_example SuperStupidStack CORSIKAunits target_link_libraries (stack_example SuperStupidStack CORSIKAunits
CORSIKAlogging) CORSIKAlogging)
# address sanitizer is making this example too slow, so we only do "undefined" # address sanitizer is making this example too slow, so we only do "undefined"
CORSIKA_ADD_EXAMPLE (cascade_example cascade_example.cc) CORSIKA_ADD_EXAMPLE (cascade_example)
target_link_libraries (cascade_example
SuperStupidStack
CORSIKAunits
CORSIKAlogging
CORSIKArandom
ProcessSibyll
CORSIKAcascade
ProcessEnergyLoss
ProcessStackInspector
ProcessParticleCut
ProcessTrackWriter
ProcessTrackingLine
CORSIKAprocesses
CORSIKAcascade
CORSIKAparticles
CORSIKAgeometry
CORSIKAenvironment
CORSIKAprocesssequence
)
install (TARGETS cascade_example DESTINATION share/examples)
CORSIKA_ADD_EXAMPLE (boundary_example boundary_example.cc)
target_link_libraries (boundary_example target_link_libraries (boundary_example
SuperStupidStack SuperStupidStack
CORSIKAunits CORSIKAunits
...@@ -62,7 +40,7 @@ target_link_libraries (boundary_example ...@@ -62,7 +40,7 @@ target_link_libraries (boundary_example
install (TARGETS boundary_example DESTINATION share/examples) install (TARGETS boundary_example DESTINATION share/examples)
if (Pythia8_FOUND) if (Pythia8_FOUND)
CORSIKA_ADD_EXAMPLE (cascade_proton_example cascade_proton_example.cc) CORSIKA_ADD_EXAMPLE (cascade_proton_example)
target_link_libraries (cascade_proton_example target_link_libraries (cascade_proton_example
SuperStupidStack SuperStupidStack
CORSIKAunits CORSIKAunits
...@@ -87,11 +65,7 @@ if (Pythia8_FOUND) ...@@ -87,11 +65,7 @@ if (Pythia8_FOUND)
) )
install (TARGETS cascade_proton_example DESTINATION share/examples) install (TARGETS cascade_proton_example DESTINATION share/examples)
<<<<<<< Updated upstream CORSIKA_ADD_EXAMPLE (vertical_EAS)
add_executable(vertical_EAS vertical_EAS.cc)
=======
CORSIKA_ADD_EXAMPLE (vertical_EAS vertical_EAS.cc)
>>>>>>> Stashed changes
target_link_libraries (vertical_EAS target_link_libraries (vertical_EAS
SuperStupidStack SuperStupidStack
CORSIKAunits CORSIKAunits
...@@ -104,17 +78,11 @@ if (Pythia8_FOUND) ...@@ -104,17 +78,11 @@ if (Pythia8_FOUND)
CORSIKAcascade CORSIKAcascade
ProcessEnergyLoss ProcessEnergyLoss
ProcessObservationPlane ProcessObservationPlane
<<<<<<< Updated upstream
ProcessTrackingLine
ProcessParticleCut
ProcessStackInspector
ProcessInteractionCounter ProcessInteractionCounter
=======
ProcessTrackWriter ProcessTrackWriter
ProcessTrackingLine ProcessTrackingLine
ProcessParticleCut ProcessParticleCut
ProcessStackInspector ProcessStackInspector
>>>>>>> Stashed changes
CORSIKAprocesses CORSIKAprocesses
CORSIKAcascade CORSIKAcascade
CORSIKAparticles CORSIKAparticles
...@@ -123,13 +91,9 @@ if (Pythia8_FOUND) ...@@ -123,13 +91,9 @@ if (Pythia8_FOUND)
CORSIKAprocesssequence CORSIKAprocesssequence
) )
install (TARGETS vertical_EAS DESTINATION share/examples) install (TARGETS vertical_EAS DESTINATION share/examples)
<<<<<<< Updated upstream
=======
>>>>>>> Stashed changes
endif() endif()
CORSIKA_ADD_EXAMPLE (stopping_power stopping_power.cc) CORSIKA_ADD_EXAMPLE (stopping_power stopping_power)
target_link_libraries (stopping_power target_link_libraries (stopping_power
SuperStupidStack SuperStupidStack
CORSIKAunits CORSIKAunits
...@@ -140,11 +104,7 @@ target_link_libraries (stopping_power ...@@ -140,11 +104,7 @@ target_link_libraries (stopping_power
) )
install (TARGETS stopping_power DESTINATION share/examples) install (TARGETS stopping_power DESTINATION share/examples)
<<<<<<< Updated upstream CORSIKA_ADD_EXAMPLE (staticsequence_example)
CORSIKA_ADD_TEST (staticsequence_example)
=======
CORSIKA_ADD_EXAMPLE (staticsequence_example staticsequence_example.cc)
>>>>>>> Stashed changes
target_link_libraries (staticsequence_example target_link_libraries (staticsequence_example
CORSIKAprocesssequence CORSIKAprocesssequence
CORSIKAunits CORSIKAunits
......
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