Merge branch '423-bug-requiring-multiple-calls-to-make-j-to-successfully-build' into 'master'

Resolve "Bug requiring multiple calls to `make -j` to successfully build."

Closes #423

See merge request !390

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

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)
 

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)
 

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)