From d856033e6a5179985bc365551ba33c74a2e01d6d Mon Sep 17 00:00:00 2001 From: ralfulrich <ralf.ulrich@kit.edu> Date: Mon, 21 Dec 2020 15:58:43 +0100 Subject: [PATCH] this works now --- cmake/CorsikaUtilities.cmake | 2 +- corsika/detail/setup/SetupStack.inl | 1 - examples/CMakeLists.txt | 32 ++++++++++++++--------------- 3 files changed, 17 insertions(+), 18 deletions(-) diff --git a/cmake/CorsikaUtilities.cmake b/cmake/CorsikaUtilities.cmake index 85e232bdc..c71e9bea3 100644 --- a/cmake/CorsikaUtilities.cmake +++ b/cmake/CorsikaUtilities.cmake @@ -110,7 +110,7 @@ function (CORSIKA_REGISTER_EXAMPLE) endif () add_dependencies (run_examples ${name}) # just run the command as-is - set (CMD ${CMAKE_CURRENT_BINARY_DIR}/${name} ${run_options}) + set (CMD ${CMAKE_BINARY_DIR}/bin/${name} ${run_options}) add_custom_command (TARGET run_examples POST_BUILD COMMAND ${CMAKE_COMMAND} -E echo "" diff --git a/corsika/detail/setup/SetupStack.inl b/corsika/detail/setup/SetupStack.inl index 4181d1eb8..56fb4ff62 100644 --- a/corsika/detail/setup/SetupStack.inl +++ b/corsika/detail/setup/SetupStack.inl @@ -5,4 +5,3 @@ * Licence version 3 (GPL Version 3). See file LICENSE for a full version of * the license. */ - diff --git a/examples/CMakeLists.txt b/examples/CMakeLists.txt index d0ddae703..c7804699f 100644 --- a/examples/CMakeLists.txt +++ b/examples/CMakeLists.txt @@ -6,30 +6,30 @@ add_executable (geometry_example geometry_example.cpp) target_link_libraries (geometry_example CORSIKA8) CORSIKA_REGISTER_EXAMPLE (geometry_example) -# logging back in March was not used -#add_executable (logger_example logger_example.cpp) -#target_link_libraries (logger_example CORSIKA8) -#CORSIKA_REGISTER_EXAMPLE (logger_example) +# # logging back in March was not used +# #add_executable (logger_example logger_example.cpp) +# #target_link_libraries (logger_example CORSIKA8) +# #CORSIKA_REGISTER_EXAMPLE (logger_example) -add_executable (stack_example stack_example.cpp) -target_link_libraries (stack_example CORSIKA8) -CORSIKA_REGISTER_EXAMPLE (stack_example) +# add_executable (stack_example stack_example.cpp) +# target_link_libraries (stack_example CORSIKA8) +# CORSIKA_REGISTER_EXAMPLE (stack_example) -add_executable (cascade_example cascade_example.cpp) -target_link_libraries (cascade_example CORSIKA8) -CORSIKA_REGISTER_EXAMPLE (cascade_example) +# add_executable (cascade_example cascade_example.cpp) +# target_link_libraries (cascade_example CORSIKA8) +# CORSIKA_REGISTER_EXAMPLE (cascade_example) add_executable (boundary_example boundary_example.cpp) target_link_libraries (boundary_example CORSIKA8) CORSIKA_REGISTER_EXAMPLE (boundary_example) -add_executable (cascade_proton_example cascade_proton_example.cpp) -target_link_libraries (cascade_proton_example CORSIKA8) -CORSIKA_REGISTER_EXAMPLE (cascade_proton_example) +# add_executable (cascade_proton_example cascade_proton_example.cpp) +# target_link_libraries (cascade_proton_example CORSIKA8) +# CORSIKA_REGISTER_EXAMPLE (cascade_proton_example) -add_executable (vertical_EAS vertical_EAS.cpp) -target_link_libraries (vertical_EAS CORSIKA8) -CORSIKA_REGISTER_EXAMPLE (vertical_EAS) +# add_executable (vertical_EAS vertical_EAS.cpp) +# target_link_libraries (vertical_EAS CORSIKA8) +# CORSIKA_REGISTER_EXAMPLE (vertical_EAS) add_executable (stopping_power stopping_power.cpp) target_link_libraries (stopping_power CORSIKA8) -- GitLab