From 4902caa6fdf80c39c23133ef9b6cdc2b24e22802 Mon Sep 17 00:00:00 2001
From: ralfulrich <ralf.ulrich@kit.edu>
Date: Fri, 29 Jan 2021 22:19:07 +0100
Subject: [PATCH] fixed wrong cmake install
---
CMakeLists.txt | 5 +++--
modules/CMakeLists_PROPOSAL.txt | 2 --
src/framework/core/CMakeLists.txt | 5 +++--
3 files changed, 6 insertions(+), 6 deletions(-)
diff --git a/CMakeLists.txt b/CMakeLists.txt
index 40954d86d..6f509f464 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -319,10 +319,11 @@ set (Pythia8_LIBDIR ${Pythia8_LIBDIR_INSTALL})
configure_package_config_file (
cmake/corsikaConfig.cmake.in
${PROJECT_BINARY_DIR}/cmake/corsikaConfig.cmake
- INSTALL_DESTINATION ${CMAKE_BINARY_DIR}/do_not_need_this
+ INSTALL_DESTINATION ${PROJECT_BINARY_DIR}/do_not_need_this
)
-install (FILES
+install (
+ FILES
${CMAKE_BINARY_DIR}/conanbuildinfo.cmake
${CMAKE_BINARY_DIR}/conaninfo.txt
${CMAKE_BINARY_DIR}/corsikaConfig.cmake
diff --git a/modules/CMakeLists_PROPOSAL.txt b/modules/CMakeLists_PROPOSAL.txt
index 3c3670283..c487b17cd 100644
--- a/modules/CMakeLists_PROPOSAL.txt
+++ b/modules/CMakeLists_PROPOSAL.txt
@@ -212,6 +212,4 @@ install(
FILES "${CMAKE_CURRENT_BINARY_DIR}/PROPOSALConfigVersion.cmake"
DESTINATION lib/cmake/PROPOSAL
)
-else (NOT IN_CORSIKA8)
-
endif (NOT IN_CORSIKA8)
diff --git a/src/framework/core/CMakeLists.txt b/src/framework/core/CMakeLists.txt
index 185ef9876..558b227f6 100644
--- a/src/framework/core/CMakeLists.txt
+++ b/src/framework/core/CMakeLists.txt
@@ -26,7 +26,8 @@ add_custom_target (GenParticlesHeaders
add_dependencies (CORSIKA8 GenParticlesHeaders)
install (
- FILES ${output_dir}/GeneratedParticleProperties.inc
- FILES ${output_dir}/GeneratedParticleClasses.inc
+ FILES
+ ${output_dir}/GeneratedParticleProperties.inc
+ ${output_dir}/GeneratedParticleClasses.inc
DESTINATION include/corsika/framework/core
)
--
GitLab