Skip to content

Commit c89b6ba

Browse files
authored
Merge pull request #38122 from peterfpeterson/releasenext_into_main
Merge release-next into main
2 parents db4f29d + 86164ab commit c89b6ba

File tree

8 files changed

+4
-489
lines changed

8 files changed

+4
-489
lines changed

Framework/Crystal/CMakeLists.txt

Lines changed: 1 addition & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -72,7 +72,6 @@ set(SRC_FILES
7272
src/SortPeaksWorkspace.cpp
7373
src/StatisticsOfPeaksWorkspace.cpp
7474
src/TransformHKL.cpp
75-
src/RotateSampleShape.cpp
7675
)
7776

7877
set(INC_FILES
@@ -152,7 +151,6 @@ set(INC_FILES
152151
inc/MantidCrystal/SortPeaksWorkspace.h
153152
inc/MantidCrystal/StatisticsOfPeaksWorkspace.h
154153
inc/MantidCrystal/TransformHKL.h
155-
inc/MantidCrystal/RotateSampleShape.h
156154
)
157155

158156
set(TEST_FILES
@@ -225,7 +223,6 @@ set(TEST_FILES
225223
SortPeaksWorkspaceTest.h
226224
StatisticsOfPeaksWorkspaceTest.h
227225
TransformHKLTest.h
228-
RotateSampleShapeTest.h
229226
)
230227

231228
if(COVERAGE)
@@ -261,7 +258,7 @@ include_directories(inc)
261258
target_link_libraries(
262259
Crystal
263260
PUBLIC Mantid::API Mantid::Geometry Mantid::Kernel
264-
PRIVATE Mantid::DataObjects Mantid::Indexing Mantid::DataHandling
261+
PRIVATE Mantid::DataObjects Mantid::Indexing
265262
)
266263

267264
# Add the unit tests directory

Framework/Crystal/inc/MantidCrystal/RotateSampleShape.h

Lines changed: 0 additions & 53 deletions
This file was deleted.

Framework/Crystal/src/RotateSampleShape.cpp

Lines changed: 0 additions & 165 deletions
This file was deleted.

0 commit comments

Comments
 (0)