Merge branch '685-improvements-for-conan2-build-system' into 'master'

Resolve "Improvements for conan2 build system"

See merge request !632

CMakeLists.txt

@@ -250,13 +250,11 @@ find_package(spdlog REQUIRED)
 find_package(yaml-cpp REQUIRED)
 find_package(Arrow REQUIRED)
 find_package(PROPOSAL REQUIRED)
-find_package(BZip2 REQUIRED)
 find_package(Catch2 REQUIRED)
 
 target_link_libraries (
   CORSIKA8
   INTERFACE
-  ZLIB::ZLIB
   BZip2::BZip2
   Boost::filesystem
   CLI11::CLI11

src/framework/core/CMakeLists.txt

 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,16 @@ 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)
+
+install (
+  FILES
+  ${output_dir}/GeneratedParticleProperties.inc
+  ${output_dir}/GeneratedParticleClasses.inc
+  DESTINATION include/corsika/framework/core
+)

src/modules/epos/CMakeLists.txt

 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,15 @@ 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)
+
+install (
+  FILES ${output_dir}/Generated.inc
+  DESTINATION include/corsika/modules/epos
+)

src/modules/fluka/CMakeLists.txt

 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,10 @@ 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)
+
+install (
+  FILES ${output_dir}/Generated.inc
+  DESTINATION include/corsika/modules/fluka
+)

src/modules/qgsjetII/CMakeLists.txt

 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,10 @@ 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)
+
+install (
+  FILES ${output_dir}/Generated.inc
+  DESTINATION include/corsika/modules/qgsjetII
+)

src/modules/sibyll/CMakeLists.txt

 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,10 @@ 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)
+
+install (
+  FILES ${output_dir}/Generated.inc
+  DESTINATION include/corsika/modules/sibyll
+)

src/modules/sophia/CMakeLists.txt

 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,10 @@ 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)
+
+install (
+  FILES ${output_dir}/Generated.inc
+  DESTINATION include/corsika/modules/sophia
+)