diff --git a/src/framework/core/CMakeLists.txt b/src/framework/core/CMakeLists.txt
index c6e4473b72471c73de99e82e1a75a88bed9b869b..4cbe6cb56ac1be27c234ed4683b80a9db714f9b6 100644
--- a/src/framework/core/CMakeLists.txt
+++ b/src/framework/core/CMakeLists.txt
@@ -1,6 +1,5 @@
set (input_dir ${PROJECT_SOURCE_DIR}/src/framework/core)
set (output_dir ${PROJECT_BINARY_DIR}/corsika/framework/core)
-set (destination_dir ${PROJECT_SOURCE_DIR}/corsika/framework/core )
file (MAKE_DIRECTORY ${output_dir})
@@ -15,8 +14,7 @@ add_custom_command (
${input_dir}/ParticleData.xml
${input_dir}/NuclearData.xml
${input_dir}/ParticleClassNames.xml
- WORKING_DIRECTORY
- ${output_dir}
+ WORKING_DIRECTORY ${output_dir}
COMMENT "Read PYTHIA8 particle data and produce C++ source code GeneratedParticle[...].inc"
VERBATIM
)
@@ -28,18 +26,9 @@ set_source_files_properties (
PROPERTIES GENERATED TRUE
)
-add_custom_command(
- OUTPUT ${destination_dir}/GeneratedParticleProperties.inc
- ${destination_dir}/GeneratedParticleClasses.inc
- COMMAND ${CMAKE_COMMAND} -E copy ${output_dir}/GeneratedParticleProperties.inc ${destination_dir}/GeneratedParticleProperties.inc
- COMMAND ${CMAKE_COMMAND} -E copy ${output_dir}/GeneratedParticleClasses.inc ${destination_dir}/GeneratedParticleClasses.inc
+add_custom_target (GenParticlesHeaders
DEPENDS ${output_dir}/GeneratedParticleProperties.inc
${output_dir}/GeneratedParticleClasses.inc
${output_dir}/particle_db.pkl
-)
-
-add_custom_target (GenParticlesHeaders
- DEPENDS ${destination_dir}/GeneratedParticleProperties.inc
- ${destination_dir}/GeneratedParticleClasses.inc
)
add_dependencies (CORSIKA8 GenParticlesHeaders)
diff --git a/src/modules/epos/CMakeLists.txt b/src/modules/epos/CMakeLists.txt
index 16f2c82b46a42a941ec9181e170c3f2aa0ee4e9b..1f2ef7d4573ef88b42d26af5b3fda75e219a0db8 100644
--- a/src/modules/epos/CMakeLists.txt
+++ b/src/modules/epos/CMakeLists.txt
@@ -1,6 +1,5 @@
set (input_dir ${PROJECT_SOURCE_DIR}/src/modules/epos)
set (output_dir ${PROJECT_BINARY_DIR}/corsika/modules/epos)
-set (destination_dir ${PROJECT_SOURCE_DIR}/corsika/modules/epos )
file (MAKE_DIRECTORY ${output_dir})
@@ -12,17 +11,10 @@ add_custom_command (
DEPENDS ${input_dir}/code_generator.py
${input_dir}/epos_codes.dat
GenParticlesHeaders # for particle_db.pkl
- WORKING_DIRECTORY
- ${output_dir}/
+ WORKING_DIRECTORY ${output_dir}
COMMENT "Generate conversion tables for particle codes EPOS <-> CORSIKA"
VERBATIM
)
-
- add_custom_command(
- OUTPUT ${destination_dir}/Generated.inc
- COMMAND ${CMAKE_COMMAND} -E copy ${output_dir}/Generated.inc ${destination_dir}/Generated.inc
- DEPENDS ${output_dir}/Generated.inc
-)
-add_custom_target (SourceDirLinkEpos DEPENDS ${destination_dir}/Generated.inc)
+add_custom_target (SourceDirLinkEpos DEPENDS ${output_dir}/Generated.inc)
add_dependencies (CORSIKA8 SourceDirLinkEpos)
diff --git a/src/modules/fluka/CMakeLists.txt b/src/modules/fluka/CMakeLists.txt
index aafdda71cefaafe9888f8ac9945331c1910aa360..a5e97dee232902ac3ecc973e8b14b505209b5df8 100644
--- a/src/modules/fluka/CMakeLists.txt
+++ b/src/modules/fluka/CMakeLists.txt
@@ -1,6 +1,5 @@
set (input_dir ${PROJECT_SOURCE_DIR}/src/modules/fluka)
set (output_dir ${PROJECT_BINARY_DIR}/corsika/modules/fluka)
-set (destination_dir ${PROJECT_SOURCE_DIR}/corsika/modules/fluka )
file (MAKE_DIRECTORY ${output_dir})
@@ -18,11 +17,5 @@ add_custom_command (
VERBATIM
)
- add_custom_command(
- OUTPUT ${destination_dir}/Generated.inc
- COMMAND ${CMAKE_COMMAND} -E copy ${output_dir}/Generated.inc ${destination_dir}/Generated.inc
- DEPENDS ${output_dir}/Generated.inc
-)
-
-add_custom_target (SourceDirLinkFLUKA DEPENDS ${destination_dir}/Generated.inc)
+add_custom_target (SourceDirLinkFLUKA DEPENDS ${output_dir}/Generated.inc)
add_dependencies (CORSIKA8 SourceDirLinkFLUKA)
diff --git a/src/modules/qgsjetII/CMakeLists.txt b/src/modules/qgsjetII/CMakeLists.txt
index eab00a52d7785b57e40ceb93abbdb8015dc3ff2b..36ef2bac7633caec5361da8d85ff1cf821ab0892 100644
--- a/src/modules/qgsjetII/CMakeLists.txt
+++ b/src/modules/qgsjetII/CMakeLists.txt
@@ -1,7 +1,5 @@
set (input_dir ${PROJECT_SOURCE_DIR}/src/modules/qgsjetII)
set (output_dir ${PROJECT_BINARY_DIR}/corsika/modules/qgsjetII)
-set (destination_dir ${PROJECT_SOURCE_DIR}/corsika/modules/qgsjetII )
-
file (MAKE_DIRECTORY ${output_dir})
@@ -14,8 +12,7 @@ add_custom_command (
${input_dir}/code_generator.py
${input_dir}/qgsjet-II-04-codes.dat
${PROJECT_BINARY_DIR}/corsika/framework/core/particle_db.pkl
- WORKING_DIRECTORY
- ${output_dir}
+ WORKING_DIRECTORY ${output_dir}
COMMENT "Generate conversion tables for particle codes QGSJetII <-> CORSIKA"
VERBATIM
)
@@ -25,11 +22,5 @@ set_source_files_properties (
PROPERTIES GENERATED TRUE
)
- add_custom_command(
- OUTPUT ${destination_dir}/Generated.inc
- COMMAND ${CMAKE_COMMAND} -E copy ${output_dir}/Generated.inc ${destination_dir}/Generated.inc
- DEPENDS ${output_dir}/Generated.inc
-)
-
-add_custom_target (SourceDirLinkQgs DEPENDS ${destination_dir}/Generated.inc)
+add_custom_target (SourceDirLinkQgs DEPENDS ${output_dir}/Generated.inc)
add_dependencies (CORSIKA8 SourceDirLinkQgs)
diff --git a/src/modules/sibyll/CMakeLists.txt b/src/modules/sibyll/CMakeLists.txt
index 2b7f23595b08d4df8a7f6b7b06727eb311a6499c..92f3622ab792259a9a20ceb0988e7d13a60124eb 100644
--- a/src/modules/sibyll/CMakeLists.txt
+++ b/src/modules/sibyll/CMakeLists.txt
@@ -1,7 +1,5 @@
set (input_dir ${PROJECT_SOURCE_DIR}/src/modules/sibyll)
set (output_dir ${PROJECT_BINARY_DIR}/corsika/modules/sibyll)
-set (destination_dir ${PROJECT_SOURCE_DIR}/corsika/modules/sibyll )
-
file (MAKE_DIRECTORY ${output_dir})
@@ -14,8 +12,7 @@ add_custom_command (
${input_dir}/sibyll_codes.dat
${PROJECT_BINARY_DIR}/corsika/framework/core/particle_db.pkl
GenParticlesHeaders
- WORKING_DIRECTORY
- ${output_dir}/
+ WORKING_DIRECTORY ${output_dir}
COMMENT "Generate conversion tables for particle codes SIBYLL <-> CORSIKA"
VERBATIM
)
@@ -25,11 +22,5 @@ set_source_files_properties (
PROPERTIES GENERATED TRUE
)
-add_custom_command(
- OUTPUT ${destination_dir}/Generated.inc
- COMMAND ${CMAKE_COMMAND} -E copy ${output_dir}/Generated.inc ${destination_dir}/Generated.inc
- DEPENDS ${output_dir}/Generated.inc
-)
-
-add_custom_target (SourceDirLinkSib DEPENDS ${destination_dir}/Generated.inc)
+add_custom_target (SourceDirLinkSib DEPENDS ${output_dir}/Generated.inc)
add_dependencies (CORSIKA8 SourceDirLinkSib)
diff --git a/src/modules/sophia/CMakeLists.txt b/src/modules/sophia/CMakeLists.txt
index e57b3b7f0322a9e8c00691aacee4e7c3e7288cad..501a33f8f277fee6ffd1e2d95ae3f9b0d0b5226c 100644
--- a/src/modules/sophia/CMakeLists.txt
+++ b/src/modules/sophia/CMakeLists.txt
@@ -1,7 +1,5 @@
set (input_dir ${PROJECT_SOURCE_DIR}/src/modules/sophia)
set (output_dir ${PROJECT_BINARY_DIR}/corsika/modules/sophia)
-set (destination_dir ${PROJECT_SOURCE_DIR}/corsika/modules/sophia )
-
file (MAKE_DIRECTORY ${output_dir})
@@ -25,12 +23,5 @@ set_source_files_properties (
PROPERTIES GENERATED TRUE
)
-add_custom_command(
- OUTPUT ${destination_dir}/Generated.inc
- COMMAND ${CMAKE_COMMAND} -E copy ${output_dir}/Generated.inc ${destination_dir}/Generated.inc
- DEPENDS ${output_dir}/Generated.inc
-)
-
-
-add_custom_target (SourceDirLinkSoph DEPENDS ${destination_dir}/Generated.inc)
+add_custom_target (SourceDirLinkSoph DEPENDS ${output_dir}/Generated.inc)
add_dependencies (CORSIKA8 SourceDirLinkSoph)