From 145d39ec97c52461ea9ab8e71e1af421b5b884b6 Mon Sep 17 00:00:00 2001
From: ralfulrich <ralf.ulrich@kit.edu>
Date: Sat, 1 May 2021 13:01:14 +0200
Subject: [PATCH] fixed dependency bug in automatic particle conversions
---
src/framework/core/CMakeLists.txt | 6 ++++--
src/modules/qgsjetII/CMakeLists.txt | 2 +-
src/modules/sibyll/CMakeLists.txt | 2 +-
3 files changed, 6 insertions(+), 4 deletions(-)
diff --git a/src/framework/core/CMakeLists.txt b/src/framework/core/CMakeLists.txt
index 558b227f6..f0edcdebd 100644
--- a/src/framework/core/CMakeLists.txt
+++ b/src/framework/core/CMakeLists.txt
@@ -5,7 +5,7 @@ file (MAKE_DIRECTORY ${output_dir})
add_custom_command (
OUTPUT ${output_dir}/GeneratedParticleProperties.inc
- OUTPUT ${output_dir}/GeneratedParticleClasses.inc
+ ${output_dir}/GeneratedParticleClasses.inc
${output_dir}/particle_db.pkl
COMMAND ${input_dir}/pdxml_reader.py ${input_dir}/ParticleData.xml
${input_dir}/NuclearData.xml
@@ -22,7 +22,9 @@ add_custom_command (
add_custom_target (GenParticlesHeaders
DEPENDS ${output_dir}/GeneratedParticleProperties.inc
- ${output_dir}/GeneratedParticleClasses.inc)
+ ${output_dir}/GeneratedParticleClasses.inc
+ ${output_dir}/particle_db.pkl
+ )
add_dependencies (CORSIKA8 GenParticlesHeaders)
install (
diff --git a/src/modules/qgsjetII/CMakeLists.txt b/src/modules/qgsjetII/CMakeLists.txt
index 36ebe9b69..9b9777356 100644
--- a/src/modules/qgsjetII/CMakeLists.txt
+++ b/src/modules/qgsjetII/CMakeLists.txt
@@ -10,7 +10,7 @@ add_custom_command (
${input_dir}/qgsjet-II-04-codes.dat
DEPENDS ${input_dir}/code_generator.py
${input_dir}/qgsjet-II-04-codes.dat
- GenParticlesHeaders # for particle_db.pkl
+ ${PROJECT_BINARY_DIR}/corsika/framework/core/particle_db.pkl
WORKING_DIRECTORY
${output_dir}
COMMENT "Generate conversion tables for particle codes QGSJetII <-> CORSIKA"
diff --git a/src/modules/sibyll/CMakeLists.txt b/src/modules/sibyll/CMakeLists.txt
index b3d97a123..969d2f1d2 100644
--- a/src/modules/sibyll/CMakeLists.txt
+++ b/src/modules/sibyll/CMakeLists.txt
@@ -10,7 +10,7 @@ add_custom_command (
${input_dir}/sibyll_codes.dat
DEPENDS ${input_dir}/code_generator.py
${input_dir}/sibyll_codes.dat
- GenParticlesHeaders # for particle_db.pkl
+ ${PROJECT_BINARY_DIR}/corsika/framework/core/particle_db.pkl
WORKING_DIRECTORY
${output_dir}/
COMMENT "Generate conversion tables for particle codes SIBYLL <-> CORSIKA"
--
GitLab