From 2106a2a1a209aadb64cc255096ea3790a111b1f5 Mon Sep 17 00:00:00 2001
From: Whitney Armstrong <warmstrong@anl.gov>
Date: Wed, 14 Oct 2020 12:56:20 -0500
Subject: [PATCH] Adding proper cmake install to juggler
- Fixed install of "run" script and removed some gaudi install cmake macros
---
CMakeLists.txt | 3 +++
JugBase/CMakeLists.txt | 4 ++--
JugDigi/CMakeLists.txt | 4 ++--
JugReco/CMakeLists.txt | 4 ++--
4 files changed, 9 insertions(+), 6 deletions(-)
diff --git a/CMakeLists.txt b/CMakeLists.txt
index f53c99b8..fe202dca 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -18,3 +18,6 @@ find_package(GaudiProject)
gaudi_project(Juggler v1r0
USE Gaudi v33r1)
+
+ install(FILES ${CMAKE_BINARY_DIR}/run
+ DESTINATION bin/)
diff --git a/JugBase/CMakeLists.txt b/JugBase/CMakeLists.txt
index cf511753..eb2c6e3a 100644
--- a/JugBase/CMakeLists.txt
+++ b/JugBase/CMakeLists.txt
@@ -16,8 +16,8 @@ find_package(DD4hep COMPONENTS DDG4 DDG4IO DDRec REQUIRED)
# this declaration will not be needed in the future
gaudi_depends_on_subdirs(GaudiAlg GaudiKernel)
-gaudi_install_scripts()
-gaudi_install_python_modules()
+#gaudi_install_scripts()
+#gaudi_install_python_modules()
gaudi_add_library(JugBase
src/*.cpp
diff --git a/JugDigi/CMakeLists.txt b/JugDigi/CMakeLists.txt
index 2aa3511b..a6c85910 100644
--- a/JugDigi/CMakeLists.txt
+++ b/JugDigi/CMakeLists.txt
@@ -14,8 +14,8 @@ find_package(DD4hep COMPONENTS DDG4 DDG4IO DDRec REQUIRED)
# this declaration will not be needed in the future
gaudi_depends_on_subdirs(GaudiAlg GaudiKernel)
-gaudi_install_scripts()
-gaudi_install_python_modules()
+#gaudi_install_scripts()
+#gaudi_install_python_modules()
#gaudi_add_library(JugBase
# src/*.cpp
diff --git a/JugReco/CMakeLists.txt b/JugReco/CMakeLists.txt
index 7daf1360..96b62b28 100644
--- a/JugReco/CMakeLists.txt
+++ b/JugReco/CMakeLists.txt
@@ -15,8 +15,8 @@ find_package(DD4hep COMPONENTS DDG4 DDG4IO DDRec REQUIRED)
# this declaration will not be needed in the future
gaudi_depends_on_subdirs(GaudiAlg GaudiKernel)
-gaudi_install_scripts()
-gaudi_install_python_modules()
+#gaudi_install_scripts()
+#gaudi_install_python_modules()
#gaudi_add_library(JugBase
# src/*.cpp
--
GitLab