From 404683b15f7d5ebc7fa83fc7c0f23ee8e309e572 Mon Sep 17 00:00:00 2001
From: Andreas Suter <andreas.suter@psi.ch>
Date: Fri, 4 May 2018 17:05:20 +0200
Subject: [PATCH] more work towards modern cmake.

---
 CMakeLists.txt             |  2 +-
 src/CMakeLists.txt         | 64 ++++++++++++++++++++++++++++++++++++--
 src/classes/CMakeLists.txt |  3 ++
 3 files changed, 66 insertions(+), 3 deletions(-)

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 895ac15e..7b33d0db 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -19,7 +19,7 @@ set(CMAKE_MODULE_PATH ${CMAKE_CURRENT_SOURCE_DIR}/cmake)
 find_package(Git REQUIRED)
 
 #--- check for ROOT -----------------------------------------------------------
-find_package(ROOT 6.06 REQUIRED COMPONENTS MathMore Minuit2 XMLParser)
+find_package(ROOT 6.06 REQUIRED COMPONENTS Gui MathMore Minuit2 XMLParser)
 if (ROOT_mathmore_FOUND)
   execute_process(COMMAND root-config --bindir OUTPUT_VARIABLE ROOT_BINDIR)
   string(STRIP ${ROOT_BINDIR} ROOT_BINDIR)
diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
index 5e9aaa6e..d81c706e 100644
--- a/src/CMakeLists.txt
+++ b/src/CMakeLists.txt
@@ -46,8 +46,68 @@ add_custom_target(
 #--- end create git-revision.h ------------------------------------------------
 
 #--- add all executables ------------------------------------------------------
-message("debug> ${CMAKE_BINARY_DIR}")
 add_executable(any2many git-revision.h any2many.cpp)
 target_include_directories(any2many BEFORE PRIVATE $<BUILD_INTERFACE:${CMAKE_BINARY_DIR}/src>)
-target_link_libraries(any2many ${ROOT_LIBRARIES} ${FFTW3_LIBRARY} ${MUSRFIT_LIBS})
+target_link_libraries(any2many ${ROOT_LIBRARIES} ${MUSRFIT_LIBS})
+
+add_executable(dump_header git-revision.h dump_header.cpp)
+target_include_directories(dump_header BEFORE PRIVATE $<BUILD_INTERFACE:${CMAKE_BINARY_DIR}/src>)
+target_link_libraries(dump_header ${ROOT_LIBRARIES} ${MUSRFIT_LIBS})
+
+add_executable(msr2data git-revision.h msr2data.cpp)
+target_include_directories(msr2data BEFORE PRIVATE $<BUILD_INTERFACE:${CMAKE_BINARY_DIR}/src>)
+target_link_libraries(msr2data ${ROOT_LIBRARIES} ${MUSRFIT_LIBS})
+
+add_executable(msr2msr msr2msr.cpp)
+target_link_libraries(msr2msr ${ROOT_LIBRARIES})
+
+add_executable(musrfit git-revision.h musrfit.cpp)
+target_include_directories(musrfit BEFORE PRIVATE $<BUILD_INTERFACE:${CMAKE_BINARY_DIR}/src>)
+target_link_libraries(musrfit ${ROOT_LIBRARIES} ${MUSRFIT_LIBS})
+
+add_executable(musrFT git-revision.h musrFT.cpp)
+target_include_directories(musrFT BEFORE PRIVATE $<BUILD_INTERFACE:${CMAKE_BINARY_DIR}/src>)
+target_link_libraries(musrFT  ${FFTW3_LIBRARY} ${ROOT_LIBRARIES} ${MUSRFIT_LIBS})
+
+add_executable(musrRootValidation git-revision.h musrRootValidation.cpp)
+target_include_directories(musrRootValidation 
+   BEFORE PRIVATE 
+     $<BUILD_INTERFACE:${CMAKE_BINARY_DIR}/src>
+     $<BUILD_INTERFACE:${LIBXML2_INCLUDE_DIR}>
+)
+target_link_libraries(musrRootValidation ${ROOT_LIBRARIES} ${MUSRFIT_LIBS} ${LIBXML2_LIBRARIES})
+
+add_executable(musrt0 git-revision.h musrt0.cpp)
+target_include_directories(musrt0 BEFORE PRIVATE $<BUILD_INTERFACE:${CMAKE_BINARY_DIR}/src>)
+target_link_libraries(musrt0 ${ROOT_LIBRARIES} ${MUSRFIT_LIBS})
+
+add_executable(musrview git-revision.h musrview.cpp)
+target_include_directories(musrview BEFORE PRIVATE $<BUILD_INTERFACE:${CMAKE_BINARY_DIR}/src>)
+target_link_libraries(musrview  ${FFTW3_LIBRARY} ${ROOT_LIBRARIES} ${MUSRFIT_LIBS})
+
+add_executable(write_musrRoot_runHeader git-revision.h write_musrRoot_runHeader.cpp)
+target_include_directories(write_musrRoot_runHeader 
+   BEFORE PRIVATE 
+     $<BUILD_INTERFACE:${CMAKE_BINARY_DIR}/src>
+     $<BUILD_INTERFACE:${LIBXML2_INCLUDE_DIR}>
+)
+target_link_libraries(write_musrRoot_runHeader ${ROOT_LIBRARIES} ${MUSRFIT_LIBS} ${LIBXML2_LIBRARIES})
+
+#--- installation info --------------------------------------------------------
+install(
+  TARGETS
+    any2many
+    dump_header
+    msr2data
+    msr2msr
+    musrfit
+    musrFT
+    musrRootValidation
+    musrt0
+    musrview
+    write_musrRoot_runHeader
+  RUNTIME DESTINATION 
+    bin
+)
+
 
diff --git a/src/classes/CMakeLists.txt b/src/classes/CMakeLists.txt
index 5812d537..66388f80 100644
--- a/src/classes/CMakeLists.txt
+++ b/src/classes/CMakeLists.txt
@@ -47,13 +47,16 @@ add_library(PMusr SHARED
   PMusr.cpp
   PMusrT0.cpp
   PMusrT0Dict.cxx
+  PPrepFourier.cpp
   PRunAsymmetry.cpp
+  PRunAsymmetryRRF.cpp
   PRunBase.cpp
   PRunDataHandler.cpp
   PRunListCollection.cpp
   PRunMuMinus.cpp
   PRunNonMusr.cpp
   PRunSingleHisto.cpp
+  PRunSingleHistoRRF.cpp
   PStartupHandler.cpp
   PStartupHandlerDict.cxx
   PTheory.cpp