From 7a22eead0e6215b69077e60a0cdf0cfc0e2e4419 Mon Sep 17 00:00:00 2001
From: ralfulrich <ralf.ulrich@kit.edu>
Date: Sun, 10 Oct 2021 23:09:55 +0200
Subject: [PATCH] fixed dependencies bug with cmake trick...
---
src/framework/core/CMakeLists.txt | 7 +++++++
src/media/CMakeLists.txt | 7 ++++++-
src/modules/qgsjetII/CMakeLists.txt | 8 +++++++-
src/modules/sibyll/CMakeLists.txt | 6 ++++++
4 files changed, 26 insertions(+), 2 deletions(-)
diff --git a/src/framework/core/CMakeLists.txt b/src/framework/core/CMakeLists.txt
index f0edcdebd..097908cf2 100644
--- a/src/framework/core/CMakeLists.txt
+++ b/src/framework/core/CMakeLists.txt
@@ -20,6 +20,13 @@ add_custom_command (
VERBATIM
)
+set_source_files_properties (
+ ${output_dir}/GeneratedParticleProperties.inc
+ ${output_dir}/GeneratedParticleClasses.inc
+ ${output_dir}/particle_db.pkl
+ PROPERTIES GENERATED TRUE
+ )
+
add_custom_target (GenParticlesHeaders
DEPENDS ${output_dir}/GeneratedParticleProperties.inc
${output_dir}/GeneratedParticleClasses.inc
diff --git a/src/media/CMakeLists.txt b/src/media/CMakeLists.txt
index df3b6e9eb..792eebfe6 100644
--- a/src/media/CMakeLists.txt
+++ b/src/media/CMakeLists.txt
@@ -4,7 +4,7 @@ set (output_dir ${PROJECT_BINARY_DIR}/corsika/media)
file (MAKE_DIRECTORY ${output_dir})
add_custom_command (
- OUTPUT ${output_dir}/GeneratedMediaProperties.inc
+ OUTPUT ${output_dir}/GeneratedMediaProperties.inc
COMMAND ${input_dir}/readProperties.py ${input_dir}/properties8.dat
DEPENDS ${input_dir}/readProperties.py
${input_dir}/properties8.dat
@@ -14,6 +14,11 @@ add_custom_command (
VERBATIM
)
+set_source_files_properties (
+ ${output_dir}/GeneratedMediaProperties.inc
+ PROPERTIES GENERATED TRUE
+)
+
add_custom_target (GenMediaProperties DEPENDS ${output_dir}/GeneratedMediaProperties.inc)
add_dependencies (CORSIKA8 GenMediaProperties)
diff --git a/src/modules/qgsjetII/CMakeLists.txt b/src/modules/qgsjetII/CMakeLists.txt
index 9b9777356..d34759329 100644
--- a/src/modules/qgsjetII/CMakeLists.txt
+++ b/src/modules/qgsjetII/CMakeLists.txt
@@ -8,7 +8,8 @@ add_custom_command (
COMMAND ${input_dir}/code_generator.py
${PROJECT_BINARY_DIR}/corsika/framework/core/particle_db.pkl
${input_dir}/qgsjet-II-04-codes.dat
- DEPENDS ${input_dir}/code_generator.py
+ DEPENDS GenParticlesHeaders
+ ${input_dir}/code_generator.py
${input_dir}/qgsjet-II-04-codes.dat
${PROJECT_BINARY_DIR}/corsika/framework/core/particle_db.pkl
WORKING_DIRECTORY
@@ -17,6 +18,11 @@ add_custom_command (
VERBATIM
)
+set_source_files_properties (
+ ${output_dir}/Generated.inc
+ PROPERTIES GENERATED TRUE
+)
+
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 969d2f1d2..1ae19d37a 100644
--- a/src/modules/sibyll/CMakeLists.txt
+++ b/src/modules/sibyll/CMakeLists.txt
@@ -11,12 +11,18 @@ add_custom_command (
DEPENDS ${input_dir}/code_generator.py
${input_dir}/sibyll_codes.dat
${PROJECT_BINARY_DIR}/corsika/framework/core/particle_db.pkl
+ GenParticlesHeaders
WORKING_DIRECTORY
${output_dir}/
COMMENT "Generate conversion tables for particle codes SIBYLL <-> CORSIKA"
VERBATIM
)
+set_source_files_properties (
+ ${output_dir}/Generated.inc
+ PROPERTIES GENERATED TRUE
+)
+
add_custom_target (SourceDirLinkSib DEPENDS ${output_dir}/Generated.inc)
add_dependencies (CORSIKA8 SourceDirLinkSib)
--
GitLab