Skip to content

Commit 7e082d4

Browse files
author
David Freese
committed
MAINT: restructure project into include, src dirs
1 parent 8298689 commit 7e082d4

File tree

191 files changed

+745
-696
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

191 files changed

+745
-696
lines changed

workspace/CMakeLists.txt renamed to CMakeLists.txt

Lines changed: 1 addition & 31 deletions
Original file line numberDiff line numberDiff line change
@@ -34,36 +34,6 @@ set(VERSION_MINOR 8)
3434
set(VERSION_PATCH 0)
3535

3636
set(CMAKE_EXPORT_COMPILE_COMMANDS ON)
37-
38-
# Download and unpack googletest at configure time
39-
configure_file(CMakeLists.txt.in googletest-download/CMakeLists.txt)
40-
execute_process(COMMAND ${CMAKE_COMMAND} -G "${CMAKE_GENERATOR}" .
41-
RESULT_VARIABLE result
42-
WORKING_DIRECTORY ${CMAKE_BINARY_DIR}/googletest-download )
43-
if(result)
44-
message(FATAL_ERROR "CMake step for googletest failed: ${result}")
45-
endif()
46-
execute_process(COMMAND ${CMAKE_COMMAND} --build .
47-
RESULT_VARIABLE result
48-
WORKING_DIRECTORY ${CMAKE_BINARY_DIR}/googletest-download )
49-
if(result)
50-
message(FATAL_ERROR "Build step for googletest failed: ${result}")
51-
endif()
52-
53-
# Prevent overriding the parent project's compiler/linker
54-
# settings on Windows
55-
set(gtest_force_shared_crt ON CACHE BOOL "" FORCE)
56-
57-
# Add googletest directly to our build. This defines
58-
# the gtest and gtest_main targets.
59-
add_subdirectory(${CMAKE_BINARY_DIR}/googletest-src
60-
${CMAKE_BINARY_DIR}/googletest-build)
61-
62-
add_subdirectory(jsoncpp)
63-
add_subdirectory(gammaray)
64-
add_subdirectory(gray)
65-
add_subdirectory(daqmodel)
66-
add_subdirectory(Viewer)
37+
add_subdirectory(src)
6738
add_subdirectory(test)
6839

69-
File renamed without changes.

workspace/gammaray/Daq/BlurFunctors.h renamed to include/Gray/Daq/BlurFunctors.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@
1010

1111
#ifndef BlurFunctors_H
1212
#define BlurFunctors_H
13-
#include <Daq/Process.h>
13+
#include "Gray/Daq/Process.h"
1414

1515
namespace BlurFunctors {
1616
using EventT = Process::EventT;

workspace/gammaray/Daq/BlurProcess.h renamed to include/Gray/Daq/BlurProcess.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@
1212
#define blurprocess_h
1313

1414
#include <functional>
15-
#include <Daq/Process.h>
15+
#include "Gray/Daq/Process.h"
1616

1717
struct ProcessStats;
1818

workspace/gammaray/Daq/CoincProcess.h renamed to include/Gray/Daq/CoincProcess.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@
1111
#ifndef coincprocess_h
1212
#define coincprocess_h
1313

14-
#include <Daq/Process.h>
14+
#include "Gray/Daq/Process.h"
1515

1616
struct ProcessStats;
1717

workspace/gammaray/Daq/DaqModel.h renamed to include/Gray/Daq/DaqModel.h

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -19,11 +19,11 @@
1919
#include <sstream>
2020
#include <utility>
2121
#include <vector>
22-
#include <Physics/Interaction.h>
23-
#include <Daq/DaqStats.h>
24-
#include <Daq/Process.h>
25-
#include <Daq/ProcessFactory.h>
26-
#include <Daq/ProcessStats.h>
22+
#include "Gray/Physics/Interaction.h"
23+
#include "Gray/Daq/DaqStats.h"
24+
#include "Gray/Daq/Process.h"
25+
#include "Gray/Daq/ProcessFactory.h"
26+
#include "Gray/Daq/ProcessStats.h"
2727

2828
class DaqModel {
2929
public:

workspace/gammaray/Daq/DaqStats.h renamed to include/Gray/Daq/DaqStats.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@
1313

1414
#include <ostream>
1515
#include <vector>
16-
#include <Daq/ProcessStats.h>
16+
#include "Gray/Daq/ProcessStats.h"
1717

1818
struct DaqStats {
1919
long no_events = 0;

workspace/gammaray/Daq/DeadtimeProcess.h renamed to include/Gray/Daq/DeadtimeProcess.h

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -12,8 +12,8 @@
1212
#define deadtimeprocess_h
1313

1414
#include <vector>
15-
#include <Daq/Mapping.h>
16-
#include <Daq/Process.h>
15+
#include "Gray/Daq/Mapping.h"
16+
#include "Gray/Daq/Process.h"
1717

1818
struct ProcessStats;
1919

0 commit comments

Comments
 (0)