Skip to content

Merge release-next into main #38122

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 4 commits into from
Oct 1, 2024
Merged

Merge release-next into main #38122

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
6bac453
Revert #37908
jclarkeSTFC Sep 26, 2024
f4da56b
Fix doc string
jclarkeSTFC Oct 1, 2024
a931470
Merge pull request #38110 from jclarkeSTFC/fix_crystal_dependency
thomashampson Oct 1, 2024
86164ab
Merge remote-tracking branch 'upstream/release-next'
peterfpeterson Oct 1, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 1 addition & 4 deletions Framework/Crystal/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -72,7 +72,6 @@ set(SRC_FILES
src/SortPeaksWorkspace.cpp
src/StatisticsOfPeaksWorkspace.cpp
src/TransformHKL.cpp
src/RotateSampleShape.cpp
)

set(INC_FILES
Expand Down Expand Up @@ -152,7 +151,6 @@ set(INC_FILES
inc/MantidCrystal/SortPeaksWorkspace.h
inc/MantidCrystal/StatisticsOfPeaksWorkspace.h
inc/MantidCrystal/TransformHKL.h
inc/MantidCrystal/RotateSampleShape.h
)

set(TEST_FILES
Expand Down Expand Up @@ -225,7 +223,6 @@ set(TEST_FILES
SortPeaksWorkspaceTest.h
StatisticsOfPeaksWorkspaceTest.h
TransformHKLTest.h
RotateSampleShapeTest.h
)

if(COVERAGE)
Expand Down Expand Up @@ -261,7 +258,7 @@ include_directories(inc)
target_link_libraries(
Crystal
PUBLIC Mantid::API Mantid::Geometry Mantid::Kernel
PRIVATE Mantid::DataObjects Mantid::Indexing Mantid::DataHandling
PRIVATE Mantid::DataObjects Mantid::Indexing
)

# Add the unit tests directory
Expand Down
53 changes: 0 additions & 53 deletions Framework/Crystal/inc/MantidCrystal/RotateSampleShape.h
View file
Open in desktop

This file was deleted.

165 changes: 0 additions & 165 deletions Framework/Crystal/src/RotateSampleShape.cpp
View file
Open in desktop

This file was deleted.

Loading
Loading