Skip to content
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

Switch Framework/SINQ to generated DllConfig.h #38520

Merged
merged 1 commit into from
Dec 19, 2024
+16 −48
Merged

Switch Framework/SINQ to generated DllConfig.h #38520

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
9 changes: 8 additions & 1 deletion Framework/SINQ/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,3 +1,5 @@
include(GenerateExportHeader)

set(SRC_FILES
src/InvertMDDim.cpp
src/LoadFlexiNexus.cpp
Expand Down Expand Up @@ -41,7 +43,6 @@ set(SRC_FILES
)

set(INC_FILES
inc/MantidSINQ/DllConfig.h
inc/MantidSINQ/InvertMDDim.h
inc/MantidSINQ/LoadFlexiNexus.h
inc/MantidSINQ/MDHistoToWorkspace2D.h
Expand Down Expand Up @@ -154,6 +155,12 @@ elseif(${CMAKE_SYSTEM_NAME} STREQUAL "Linux")
set_target_properties(SINQ PROPERTIES INSTALL_RPATH "\$ORIGIN/../${LIB_DIR}")
endif()

# Auto-generate exports header
target_include_directories(
SINQ PUBLIC $<BUILD_INTERFACE:${CMAKE_BINARY_DIR}/Framework/SINQ> $<INSTALL_INTERFACE:include/Mantid>
)
generate_mantid_export_header(SINQ False)

# Add to the 'Framework' group in VS
set_property(TARGET SINQ PROPERTY FOLDER "MantidFramework")

Expand Down
21 changes: 0 additions & 21 deletions Framework/SINQ/inc/MantidSINQ/DllConfig.h
View file
Open in desktop

This file was deleted.

2 changes: 0 additions & 2 deletions Framework/SINQ/inc/MantidSINQ/PoldiFitPeaks1D.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,8 +7,6 @@
#pragma once

#include "MantidAPI/Algorithm.h"
#include "MantidKernel/System.h"

#include "MantidAPI/IPeakFunction.h"
#include "MantidAPI/TableRow.h"
#include "MantidDataObjects/TableWorkspace.h"
Expand Down
2 changes: 0 additions & 2 deletions Framework/SINQ/inc/MantidSINQ/PoldiFitPeaks1D2.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,8 +7,6 @@
#pragma once

#include "MantidAPI/Algorithm.h"
#include "MantidKernel/System.h"

#include "MantidAPI/IPeakFunction.h"
#include "MantidAPI/TableRow.h"
#include "MantidAPI/WorkspaceGroup_fwd.h"
Expand Down
1 change: 0 additions & 1 deletion Framework/SINQ/inc/MantidSINQ/PoldiFitPeaks2D.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,6 @@
#include "MantidAPI/IFunction.h"
#include "MantidAPI/IPeakFunction.h"
#include "MantidGeometry/Crystal/PointGroup.h"
#include "MantidKernel/System.h"
#include "MantidSINQ/DllConfig.h"

#include "MantidKernel/Matrix.h"
Expand Down
1 change: 0 additions & 1 deletion Framework/SINQ/inc/MantidSINQ/PoldiPeakSearch.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,6 @@
#include "MantidSINQ/DllConfig.h"

#include "MantidAPI/Algorithm.h"
#include "MantidKernel/System.h"
#include "MantidKernel/Unit.h"
#include "MantidKernel/V2D.h"

Expand Down
2 changes: 1 addition & 1 deletion Framework/SINQ/inc/MantidSINQ/PoldiTruncateData.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@
#pragma once

#include "MantidAPI/Algorithm.h"
#include "MantidKernel/System.h"
#include "MantidSINQ/DllConfig.h"

#include "MantidSINQ/PoldiUtilities/PoldiAbstractChopper.h"

Expand Down
1 change: 0 additions & 1 deletion Framework/SINQ/inc/MantidSINQ/PoldiUtilities/Poldi2DFunction.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,6 @@

#include "MantidAPI/CompositeFunction.h"
#include "MantidAPI/IFunction1DSpectrum.h"
#include "MantidKernel/System.h"
#include "MantidSINQ/DllConfig.h"
#include "MantidSINQ/PoldiUtilities/IPoldiFunction1D.h"

Expand Down
2 changes: 0 additions & 2 deletions Framework/SINQ/inc/MantidSINQ/PoldiUtilities/PoldiAutoCorrelationCore.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,8 +6,6 @@
// SPDX - License - Identifier: GPL - 3.0 +
#pragma once

#include "MantidKernel/System.h"

#include "MantidSINQ/DllConfig.h"

#include "MantidSINQ/PoldiUtilities/PoldiAbstractChopper.h"
Expand Down
2 changes: 0 additions & 2 deletions Framework/SINQ/inc/MantidSINQ/PoldiUtilities/PoldiBasicChopper.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,8 +6,6 @@
// SPDX - License - Identifier: GPL - 3.0 +
#pragma once

#include "MantidKernel/System.h"

#include "MantidSINQ/DllConfig.h"
#include "MantidSINQ/PoldiUtilities/PoldiAbstractChopper.h"

Expand Down
2 changes: 0 additions & 2 deletions Framework/SINQ/inc/MantidSINQ/PoldiUtilities/PoldiChopperFactory.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,8 +6,6 @@
// SPDX - License - Identifier: GPL - 3.0 +
#pragma once

#include "MantidKernel/System.h"

#include "MantidSINQ/DllConfig.h"
#include "MantidSINQ/PoldiUtilities/PoldiAbstractChopper.h"

Expand Down
2 changes: 0 additions & 2 deletions Framework/SINQ/inc/MantidSINQ/PoldiUtilities/PoldiDeadWireDecorator.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,8 +6,6 @@
// SPDX - License - Identifier: GPL - 3.0 +
#pragma once

#include "MantidKernel/System.h"

#include "MantidSINQ/DllConfig.h"
#include "MantidSINQ/PoldiUtilities/PoldiDetectorDecorator.h"

Expand Down
1 change: 0 additions & 1 deletion Framework/SINQ/inc/MantidSINQ/PoldiUtilities/PoldiDetectorDecorator.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,6 @@
// SPDX - License - Identifier: GPL - 3.0 +
#pragma once

#include "MantidKernel/System.h"
#include "MantidSINQ/DllConfig.h"

#include "MantidSINQ/PoldiUtilities/PoldiAbstractDetector.h"
Expand Down
1 change: 0 additions & 1 deletion Framework/SINQ/inc/MantidSINQ/PoldiUtilities/PoldiInstrumentAdapter.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,6 @@
#include "MantidAPI/MatrixWorkspace_fwd.h"
#include "MantidAPI/Run.h"
#include "MantidGeometry/Instrument.h"
#include "MantidKernel/System.h"
#include "MantidSINQ/DllConfig.h"

#include <map>
Expand Down
1 change: 0 additions & 1 deletion Framework/SINQ/inc/MantidSINQ/PoldiUtilities/PoldiTimeTransformer.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,6 @@
// SPDX - License - Identifier: GPL - 3.0 +
#pragma once

#include "MantidKernel/System.h"
#include "MantidSINQ/DllConfig.h"
#include "MantidSINQ/PoldiUtilities/PoldiConversions.h"
#include "MantidSINQ/PoldiUtilities/PoldiInstrumentAdapter.h"
Expand Down
14 changes: 7 additions & 7 deletions buildconfig/CMake/CppCheck_Suppressions.txt.in
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -966,10 +966,10 @@ constVariablePointer:${CMAKE_SOURCE_DIR}/Framework/Reflectometry/src/Reflectomet
missingOverride:${CMAKE_SOURCE_DIR}/Framework/SINQ/inc/MantidSINQ/PoldiCreatePeaksFromCell.h:31
constVariablePointer:${CMAKE_SOURCE_DIR}/Framework/SINQ/src/PoldiCreatePeaksFromCell.cpp:49
constVariablePointer:${CMAKE_SOURCE_DIR}/Framework/SINQ/src/PoldiCreatePeaksFromCell.cpp:83
virtualCallInConstructor:${CMAKE_SOURCE_DIR}/Framework/SINQ/inc/MantidSINQ/PoldiUtilities/PoldiDetectorDecorator.h:49
virtualCallInConstructor:${CMAKE_SOURCE_DIR}/Framework/SINQ/inc/MantidSINQ/PoldiUtilities/PoldiDetectorDecorator.h:48
constParameterReference:${CMAKE_SOURCE_DIR}/Framework/Reflectometry/src/SpecularReflectionPositionCorrect2.cpp:194
virtualCallInConstructor:${CMAKE_SOURCE_DIR}/Framework/SINQ/inc/MantidSINQ/PoldiUtilities/PoldiDeadWireDecorator.h:46
returnByReference:${CMAKE_SOURCE_DIR}/Framework/SINQ/inc/MantidSINQ/PoldiUtilities/PoldiDeadWireDecorator.h:40
virtualCallInConstructor:${CMAKE_SOURCE_DIR}/Framework/SINQ/inc/MantidSINQ/PoldiUtilities/PoldiDeadWireDecorator.h:44
returnByReference:${CMAKE_SOURCE_DIR}/Framework/SINQ/inc/MantidSINQ/PoldiUtilities/PoldiDeadWireDecorator.h:38
constVariablePointer:${CMAKE_SOURCE_DIR}/Framework/Reflectometry/src/ReflectometryWorkflowBase2.cpp:408
constVariablePointer:${CMAKE_SOURCE_DIR}/Framework/Reflectometry/src/ReflectometryWorkflowBase2.cpp:632
constVariablePointer:${CMAKE_SOURCE_DIR}/Framework/Reflectometry/src/ReflectometryWorkflowBase2.cpp:637
Expand All @@ -988,14 +988,14 @@ returnByReference:${CMAKE_SOURCE_DIR}/Framework/TestHelpers/inc/MantidFrameworkT
returnDanglingLifetime:${CMAKE_SOURCE_DIR}/Framework/SINQ/src/PoldiPeakSearch.cpp:125
missingOverride:${CMAKE_SOURCE_DIR}/Framework/SINQ/inc/MantidSINQ/PoldiAnalyseResiduals.h:29
constParameterPointer:${CMAKE_SOURCE_DIR}/Framework/SINQ/src/PoldiUtilities/PoldiInstrumentAdapter.cpp:258
missingOverride:${CMAKE_SOURCE_DIR}/Framework/SINQ/inc/MantidSINQ/PoldiPeakSearch.h:40
missingOverride:${CMAKE_SOURCE_DIR}/Framework/SINQ/inc/MantidSINQ/PoldiPeakSearch.h:39
missingOverride:${CMAKE_SOURCE_DIR}/Testing/Tools/cxxtest/cxxtest/GlobalFixture.h:22
passedByValue:${CMAKE_SOURCE_DIR}/Framework/SINQ/src/PoldiPeakSearch.cpp:183
missingOverride:${CMAKE_SOURCE_DIR}/Framework/SINQ/inc/MantidSINQ/PoldiFitPeaks1D2.h:67
returnByReference:${CMAKE_SOURCE_DIR}/Framework/SINQ/inc/MantidSINQ/PoldiFitPeaks1D2.h:39
missingOverride:${CMAKE_SOURCE_DIR}/Framework/SINQ/inc/MantidSINQ/PoldiFitPeaks1D2.h:65
returnByReference:${CMAKE_SOURCE_DIR}/Framework/SINQ/inc/MantidSINQ/PoldiFitPeaks1D2.h:37
passedByValue:${CMAKE_SOURCE_DIR}/Framework/SINQ/src/SliceMDHisto.cpp:95
constVariableReference:${CMAKE_SOURCE_DIR}/Framework/SINQ/src/PoldiFitPeaks1D2.cpp:205
missingOverride:${CMAKE_SOURCE_DIR}/Framework/SINQ/inc/MantidSINQ/PoldiFitPeaks1D.h:30
missingOverride:${CMAKE_SOURCE_DIR}/Framework/SINQ/inc/MantidSINQ/PoldiFitPeaks1D.h:28
uselessOverride:${CMAKE_SOURCE_DIR}/Framework/TestHelpers/inc/MantidFrameworkTestHelpers/FakeObjects.h:598
knownConditionTrueFalse:${CMAKE_SOURCE_DIR}/Framework/TestHelpers/inc/MantidFrameworkTestHelpers/FakeObjects.h:152
constVariablePointer:${CMAKE_SOURCE_DIR}/Framework/WorkflowAlgorithms/src/DgsConvertToEnergyTransfer.cpp:99
Expand Down
Loading