From d6448ea42faa18122fa24dd7c46cf85efb1c1693 Mon Sep 17 00:00:00 2001
From: Paolo Andreetto <paolo.andreetto@pd.infn.it>
Date: Wed, 5 Jun 2019 11:56:19 +0000
Subject: [PATCH] Re-inserted detector header files

---
 CMake/cmt-ulib.spec.in       |  2 ++
 CMake/uLibConfigHeader.cmake |  6 ----
 CMakeLists.txt               |  3 +-
 src/Detectors/CMakeLists.txt | 62 ++++++++++++++++++------------------
 4 files changed, 35 insertions(+), 38 deletions(-)

diff --git a/CMake/cmt-ulib.spec.in b/CMake/cmt-ulib.spec.in
index 05bb1a1..ca943e3 100644
--- a/CMake/cmt-ulib.spec.in
+++ b/CMake/cmt-ulib.spec.in
@@ -87,12 +87,14 @@ analysis and imaging software Developed by University of Padova and INFN Sezione
 %dir /usr/include/mutom-0.2/Core
 %dir /usr/include/mutom-0.2/Math
 %dir /usr/include/mutom-0.2/Root
+%dir /usr/include/mutom-0.2/Detectors
 %dir /usr/include/mutom-0.2/Vtk
 /usr/include/mutom-0.2/*.h
 /usr/include/mutom-0.2/Core/*.h
 /usr/include/mutom-0.2/Math/*.h
 /usr/include/mutom-0.2/Math/*.hpp
 /usr/include/mutom-0.2/Root/*.h
+/usr/include/mutom-0.2/Detectors/*.h
 /usr/include/mutom-0.2/Vtk/*.h
 
 
diff --git a/CMake/uLibConfigHeader.cmake b/CMake/uLibConfigHeader.cmake
index 363bbe3..a80038b 100644
--- a/CMake/uLibConfigHeader.cmake
+++ b/CMake/uLibConfigHeader.cmake
@@ -16,12 +16,6 @@ set(BOOST_PP_VARIADICS ON)
 message(STATUS "PROJECT NAME = ${PROJECT_NAME}")
 message(STATUS "PACKAGE VERSION = ${PACKAGE_VERSION}")
 message(STATUS "PACKAGE NAME = ${PACKAGE_NAME}")
-execute_process(COMMAND "svnversion"
-                WORKING_DIRECTORY ${PROJECT_SOURCE_DIR}
-                OUTPUT_VARIABLE SVN_REVISION
-                OUTPUT_STRIP_TRAILING_WHITESPACE )
-
-message(STATUS "SVN REVISION = ${SVN_REVISION}")
 
 CHECK_INCLUDE_FILES(inittypes.h HAVE_INITTYPES_H)
 CHECK_INCLUDE_FILES(stdbool.h HAVE_STDBOOL_H)
diff --git a/CMakeLists.txt b/CMakeLists.txt
index af175ec..42df1af 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -31,7 +31,7 @@ message(STATUS "Module path: ${CMAKE_MODULE_PATH}")
 include(uLibMacros)
 include(uLibDebugMacro)
 include(uLibTargetMacros)
-include(uLibGenerateRMake)
+#include(uLibGenerateRMake)
 
 
 ## GLOBALS ------------------------------------------------------------------ ##
@@ -57,6 +57,7 @@ set(ULIB_SELECTED_MODULES
       Core
       Math
       Root
+      Detectors
 )
 
 ## uLib_add_shared_library puts names there
diff --git a/src/Detectors/CMakeLists.txt b/src/Detectors/CMakeLists.txt
index 6d74131..f7ca12e 100644
--- a/src/Detectors/CMakeLists.txt
+++ b/src/Detectors/CMakeLists.txt
@@ -1,37 +1,37 @@
-# HEADERS
-set(HEADERS
-                                DetectorChamber.h
-                                ExperimentFitEvent.h
-                                GeantEvent.h
-                                HitMC.h
-                                MuonScatter.h
-                                MuonEvent.h
-                                MuonError.h
-                                ChamberHitEvent.h
-                                Hit.h
-                                LinearFit.h
-                                Solid.h
-                                Matter.h
-                                Scene.h
-)
+#set(HEADERS
+#                                DetectorChamber.h
+#                                ExperimentFitEvent.h
+#                                GeantEvent.h
+#                                HitMC.h
+#                                MuonScatter.h
+#                                MuonEvent.h
+#                                MuonError.h
+#                                ChamberHitEvent.h
+#                                Hit.h
+#                                LinearFit.h
+#                                Solid.h
+#                                Matter.h
+#                                Scene.h
+#)
 
 
-# SOURCES
-set(SOURCES
-                Solid.cpp
-                Scene.cpp
-)
+#set(SOURCES
+#                Solid.cpp
+#                Scene.cpp
+#)
 
-set(LIBRARIES
-       ${Boost_SERIALIZATION_LIBRARY}
-       ${Boost_SIGNALS_LIBRARY}
-       ${Boost_PROGRAM_OPTIONS_LIBRARY}
-       ${Eigen_LIBRARY}
-       ${Geant4_LIBRARIES}
-       ${ROOT_LIBRARIES}
-       ${PACKAGE_LIBPREFIX}Core
-       ${PACKAGE_LIBPREFIX}Math
-)
+#set(LIBRARIES
+#       ${Boost_SERIALIZATION_LIBRARY}
+#       ${Boost_SIGNALS_LIBRARY}
+#       ${Boost_PROGRAM_OPTIONS_LIBRARY}
+#       ${Eigen_LIBRARY}
+#       ${Geant4_LIBRARIES}
+#       ${ROOT_LIBRARIES}
+#       ${PACKAGE_LIBPREFIX}Core
+#       ${PACKAGE_LIBPREFIX}Math
+#)
+
+set(HEADERS MuonScatter.h MuonError.h MuonEvent.h)
 
 uLib_add_shared_library(${uLib-module})
 add_subdirectory(testing)