From 344dce4dec3a3a7423c70868de3cb5bb55d3d0ec Mon Sep 17 00:00:00 2001 From: Florian Uhlig <f.uhlig@gsi.de> Date: Wed, 10 Feb 2021 18:17:58 +0100 Subject: [PATCH] Fix installation target Properly install AnalysisTreeQA. Install missing pluto header file. Closes #2006 @1h --- external/InstallAnalysisTreeQA.cmake | 4 ++-- sim/transport/generators/CMakeLists.txt | 5 +++++ 2 files changed, 7 insertions(+), 2 deletions(-) diff --git a/external/InstallAnalysisTreeQA.cmake b/external/InstallAnalysisTreeQA.cmake index 2e01864d2c..42a1391dbd 100644 --- a/external/InstallAnalysisTreeQA.cmake +++ b/external/InstallAnalysisTreeQA.cmake @@ -2,7 +2,7 @@ set(ANALYSISTREEQA_VERSION be56549d0ee90b628e1ec49131924a03982365d6) set(ANALYSISTREEQA_SRC_URL "https://github.com/HeavyIonAnalysis/AnalysisTreeQA.git") set(ANALYSISTREEQA_DESTDIR "${CMAKE_BINARY_DIR}/external/ANALYSISTREEQA-prefix") -set(ANALYSISTREEQA_LIBNAME "${CMAKE_SHARED_LIBRARY_PREFIX}AnalysisTreeQA${CMAKE_STATIC_LIBRARY_SUFFIX}") +set(ANALYSISTREEQA_LIBNAME "AnalysisTreeQA") download_project_if_needed(PROJECT AnalysisTreeQA_source GIT_REPOSITORY ${ANALYSISTREEQA_SRC_URL} @@ -57,6 +57,6 @@ Install(DIRECTORY ${CMAKE_BINARY_DIR}/include/AnalysisTreeQA DESTINATION include ) -Install(FILES {CMAKE_SOURCE_DIR}/macro/analysis/common/qa/run_analysistree_qa.C +Install(FILES ${CMAKE_SOURCE_DIR}/macro/analysis/common/qa/run_analysistree_qa.C DESTINATION share/cbmroot/macro ) diff --git a/sim/transport/generators/CMakeLists.txt b/sim/transport/generators/CMakeLists.txt index f03069cc81..556e0de5d1 100644 --- a/sim/transport/generators/CMakeLists.txt +++ b/sim/transport/generators/CMakeLists.txt @@ -75,3 +75,8 @@ include_directories(SYSTEM ${SYSTEM_INCLUDE_DIRECTORIES}) link_directories( ${LINK_DIRECTORIES}) GENERATE_LIBRARY() # --------------------------------------------------------- + + +Install(FILES ${CMAKE_CURRENT_SOURCE_DIR}/pluto/Pdefines.h + DESTINATION include + ) -- GitLab