Commit 4692927b authored by gsell's avatar gsell
Browse files

Merge branch '397-cleanup-in-other-cmakelists-txt' into 'master'

Resolve "Cleanup in other CMakeLists.txt"

Closes #397

See merge request !209
parents 388de2bb 04d8736d
......@@ -23,7 +23,7 @@ include_directories (
${CMAKE_CURRENT_SOURCE_DIR}
)
add_opal_sources(${_SRCS})
add_opal_sources (${_SRCS})
set (HDRS
Action.h
......@@ -47,4 +47,12 @@ set (HDRS
ValueDefinition.h
)
install (FILES ${HDRS} DESTINATION "${CMAKE_INSTALL_PREFIX}/include/AbstractObjects")
\ No newline at end of file
install (FILES ${HDRS} DESTINATION "${CMAKE_INSTALL_PREFIX}/include/AbstractObjects")
# vi: set et ts=4 sw=4 sts=4:
# Local Variables:
# mode: cmake
# cmake-tab-width: 4
# indent-tabs-mode: nil
# End:
set (_SRCS
QRSolver.cpp
)
QRSolver.cpp
)
include_directories (
${CMAKE_CURRENT_SOURCE_DIR}
)
${CMAKE_CURRENT_SOURCE_DIR}
)
add_opal_sources(${_SRCS})
set (HDRS
QRSolver.h
)
)
install (FILES ${HDRS} DESTINATION "${CMAKE_INSTALL_PREFIX}/include/Algebra")
\ No newline at end of file
install (FILES ${HDRS} DESTINATION "${CMAKE_INSTALL_PREFIX}/include/Algebra")
# vi: set et ts=4 sw=4 sts=4:
# Local Variables:
# mode: cmake
# cmake-tab-width: 4
# indent-tabs-mode: nil
# End:
set (_SRCS
CavityAutophaser.cpp
Ctunes.cpp
IndexMap.cpp
Hamiltonian.cpp
LieMapper.cpp
lomb.cpp
NilTracker.cpp
MapAnalyser.cpp
MPSplitIntegrator.cpp
MultiBunchHandler.cpp
OrbitThreader.cpp
ParallelCyclotronTracker.cpp
ParallelSliceTracker.cpp
ParallelTTracker.cpp
StepSizeConfig.cpp
ThickMapper.cpp
ThickTracker.cpp
TransportMapper.cpp
bet/EnvelopeSlice.cpp
bet/EnvelopeBunch.cpp
bet/profile.cpp
bet/math/integrate.cpp
bet/math/interpol.cpp
bet/math/rk.cpp
bet/math/functions.cpp
bet/math/linfit.cpp
bet/math/root.cpp
bet/math/savgol.cpp
bet/math/svdfit.cpp
bet/BetError.cpp
)
CavityAutophaser.cpp
Ctunes.cpp
IndexMap.cpp
Hamiltonian.cpp
LieMapper.cpp
lomb.cpp
NilTracker.cpp
MapAnalyser.cpp
MPSplitIntegrator.cpp
MultiBunchHandler.cpp
OrbitThreader.cpp
ParallelCyclotronTracker.cpp
ParallelSliceTracker.cpp
ParallelTTracker.cpp
StepSizeConfig.cpp
ThickMapper.cpp
ThickTracker.cpp
TransportMapper.cpp
bet/EnvelopeSlice.cpp
bet/EnvelopeBunch.cpp
bet/profile.cpp
bet/math/integrate.cpp
bet/math/interpol.cpp
bet/math/rk.cpp
bet/math/functions.cpp
bet/math/linfit.cpp
bet/math/root.cpp
bet/math/savgol.cpp
bet/math/svdfit.cpp
bet/BetError.cpp
)
include_directories (
${CMAKE_CURRENT_SOURCE_DIR}
)
${CMAKE_CURRENT_SOURCE_DIR}
)
add_opal_sources(${_SRCS})
......@@ -68,6 +68,14 @@ set (HDRS
bet/math/root.h
bet/math/savgol.h
bet/math/svdfit.h
)
)
install (FILES ${HDRS} DESTINATION "${CMAKE_INSTALL_PREFIX}/include/Algorithms")
\ No newline at end of file
install (FILES ${HDRS} DESTINATION "${CMAKE_INSTALL_PREFIX}/include/Algorithms")
# vi: set et ts=4 sw=4 sts=4:
# Local Variables:
# mode: cmake
# cmake-tab-width: 4
# indent-tabs-mode: nil
# End:
......@@ -2,17 +2,18 @@ set (_SRCS
AmrBoxLib.cpp
AmrObject.cpp
AmrYtWriter.cpp
)
)
include_directories (
${CMAKE_CURRENT_SOURCE_DIR}
)
${CMAKE_CURRENT_SOURCE_DIR}
)
add_opal_sources(${_SRCS})
add_compile_options (-Wno-unused-variable
-Wno-unused-but-set-variable
-Wno-maybe-uninitialized)
-Wno-unused-but-set-variable
-Wno-maybe-uninitialized
)
set (HDRS
AbstractAmrWriter.h
......@@ -23,6 +24,14 @@ set (HDRS
BoxLibLayout.hpp
BoxLibParticle.h
BoxLibParticle.hpp
)
)
install (FILES ${HDRS} DESTINATION "${CMAKE_INSTALL_PREFIX}/include/Amr")
\ No newline at end of file
install (FILES ${HDRS} DESTINATION "${CMAKE_INSTALL_PREFIX}/include/Amr")
# vi: set et ts=4 sw=4 sts=4:
# Local Variables:
# mode: cmake
# cmake-tab-width: 4
# indent-tabs-mode: nil
# End:
set (_SRCS
Split.cpp
Aperture.cpp
)
Split.cpp
Aperture.cpp
)
include_directories (
${CMAKE_CURRENT_SOURCE_DIR}
)
${CMAKE_CURRENT_SOURCE_DIR}
)
add_opal_sources(${_SRCS})
add_opal_sources (${_SRCS})
set (HDRS
Aperture.h
Split.h
)
)
install (FILES ${HDRS} DESTINATION "${CMAKE_INSTALL_PREFIX}/include/Aperture")
\ No newline at end of file
install (FILES ${HDRS} DESTINATION "${CMAKE_INSTALL_PREFIX}/include/Aperture")
# vi: set et ts=4 sw=4 sts=4:
# Local Variables:
# mode: cmake
# cmake-tab-width: 4
# indent-tabs-mode: nil
# End:
......@@ -12,13 +12,13 @@ set (_SRCS
TableRow.cpp
TokenList.cpp
TokenListArray.cpp
)
)
include_directories (
${CMAKE_CURRENT_SOURCE_DIR}
)
${CMAKE_CURRENT_SOURCE_DIR}
)
add_opal_sources(${_SRCS})
add_opal_sources (${_SRCS})
set (HDRS
Attributes.h
......@@ -34,6 +34,14 @@ set (HDRS
TableRow.h
TokenListArray.h
TokenList.h
)
)
install (FILES ${HDRS} DESTINATION "${CMAKE_INSTALL_PREFIX}/include/Attributes")
\ No newline at end of file
install (FILES ${HDRS} DESTINATION "${CMAKE_INSTALL_PREFIX}/include/Attributes")
# vi: set et ts=4 sw=4 sts=4:
# Local Variables:
# mode: cmake
# cmake-tab-width: 4
# indent-tabs-mode: nil
# End:
set (_SRCS
Call.cpp
Dump.cpp
DumpFields.cpp
DumpEMFields.cpp
Echo.cpp
Help.cpp
Option.cpp
Save.cpp
Select.cpp
Show.cpp
Stop.cpp
Quit.cpp
PSystem.cpp
System.cpp
Title.cpp
Value.cpp
What.cpp
)
Call.cpp
Dump.cpp
DumpFields.cpp
DumpEMFields.cpp
Echo.cpp
Help.cpp
Option.cpp
Save.cpp
Select.cpp
Show.cpp
Stop.cpp
Quit.cpp
PSystem.cpp
System.cpp
Title.cpp
Value.cpp
What.cpp
)
include_directories (
${CMAKE_CURRENT_SOURCE_DIR}
)
${CMAKE_CURRENT_SOURCE_DIR}
)
add_opal_sources(${_SRCS})
......@@ -42,6 +42,14 @@ set (HDRS
Title.h
Value.h
What.h
)
)
install (FILES ${HDRS} DESTINATION "${CMAKE_INSTALL_PREFIX}/include/BasicActions")
# vi: set et ts=4 sw=4 sts=4:
# Local Variables:
# mode: cmake
# cmake-tab-width: 4
# indent-tabs-mode: nil
# End:
......@@ -18,8 +18,9 @@ if (ENABLE_AMR)
${Fortran_LIBS}
${AMREX_EXTRA_Fortran_LINK_LINE}
${AMREX_LIBRARIES}
)
else (ENABLE_AMR)
)
else ()
set(AMR_LIBS "")
endif ()
......
......@@ -39,9 +39,7 @@
#include <iostream>
#include <new>
#include <cstring>
#ifndef IPPL_GPLUSPLUS
#include <functional>
#endif
// Helper functions.
......@@ -529,7 +527,7 @@ template <class T>
Tps<T> &Tps<T>::operator*=(const T &rhs) {
unique();
T *x = rep->data();
std::transform(x, x + rep->len, x, std::bind2nd(std::multiplies<T>(), rhs));
std::transform(x, x + rep->len, x, std::bind(std::multiplies<T>(), std::placeholders::_1, rhs));
return *this;
}
......@@ -538,7 +536,7 @@ template <class T>
Tps<T> &Tps<T>::operator/=(const T &rhs) {
if(rhs == T(0)) throw DivideError("Tps::operator/()");
T *x = rep->data();
std::transform(x, x + rep->len, x, std::bind2nd(std::divides<T>(), rhs));
std::transform(x, x + rep->len, x, std::bind(std::divides<T>(), std::placeholders::_1, rhs));
return *this;
}
......@@ -879,7 +877,7 @@ Tps<T> Tps<T>::multiply(const Tps<T> &rhs, int trunc) const {
const T y = rhs.rep->data()[0];
T *z = result.rep->data();
std::transform(x, x + rep->len, z,
std::bind2nd(std::multiplies<T>(), y));
std::bind(std::multiplies<T>(), std::placeholders::_1, y));
return result;
}
} else {
......@@ -889,7 +887,7 @@ Tps<T> Tps<T>::multiply(const Tps<T> &rhs, int trunc) const {
const T *y = rhs.rep->data();
T *z = result.rep->data();
std::transform(y, y + rep->len, z,
std::bind2nd(std::multiplies<T>(), x));
std::bind(std::multiplies<T>(), std::placeholders::_1, x));
return result;
}
}
......@@ -1098,4 +1096,4 @@ template <class T> inline
Tps<T>::Tps(TpsRep<T> *d): rep(d)
{}
#endif // CLASSIC_Tps_CC
\ No newline at end of file
#endif // CLASSIC_Tps_CC
set (_SRCS
Distribution.cpp
LaserProfile.cpp
)
Distribution.cpp
LaserProfile.cpp
)
include_directories (
${CMAKE_CURRENT_SOURCE_DIR}
)
${CMAKE_CURRENT_SOURCE_DIR}
)
add_opal_sources(${_SRCS})
......@@ -18,6 +18,14 @@ set (HDRS
matrix_vector_operation.h
rdm.h
SigmaGenerator.h
)
)
install (FILES ${HDRS} DESTINATION "${CMAKE_INSTALL_PREFIX}/include/Distribution")
\ No newline at end of file
install (FILES ${HDRS} DESTINATION "${CMAKE_INSTALL_PREFIX}/include/Distribution")
# vi: set et ts=4 sw=4 sts=4:
# Local Variables:
# mode: cmake
# cmake-tab-width: 4
# indent-tabs-mode: nil
# End:
set (_SRCS
Edit.cpp
EditCmd.cpp
EditCycle.cpp
EditEnd.cpp
EditFlatten.cpp
EditInstall.cpp
EditMove.cpp
EditParser.cpp
EditReflect.cpp
EditRemove.cpp
EditReplace.cpp
EditSelect.cpp
)
Edit.cpp
EditCmd.cpp
EditCycle.cpp
EditEnd.cpp
EditFlatten.cpp
EditInstall.cpp
EditMove.cpp
EditParser.cpp
EditReflect.cpp
EditRemove.cpp
EditReplace.cpp
EditSelect.cpp
)
include_directories (
${CMAKE_CURRENT_SOURCE_DIR}
)
${CMAKE_CURRENT_SOURCE_DIR}
)
add_opal_sources(${_SRCS})
......@@ -32,6 +32,14 @@ set (HDRS
EditRemove.h
EditReplace.h
EditSelect.h
)
)
install (FILES ${HDRS} DESTINATION "${CMAKE_INSTALL_PREFIX}/include/Editor")
\ No newline at end of file
install (FILES ${HDRS} DESTINATION "${CMAKE_INSTALL_PREFIX}/include/Editor")
# vi: set et ts=4 sw=4 sts=4:
# Local Variables:
# mode: cmake
# cmake-tab-width: 4
# indent-tabs-mode: nil
# End:
set (_SRCS
AttCell.cpp
OpalBeamStripping.cpp
OpalBend.cpp
OpalCavity.cpp
OpalTravelingWave.cpp
OpalCCollimator.cpp
OpalCyclotron.cpp
OpalDrift.cpp
OpalECollimator.cpp
OpalFlexibleCollimator.cpp
OpalDegrader.cpp
OpalElement.cpp
OpalHKicker.cpp
OpalHMonitor.cpp
OpalInstrument.cpp
OpalKicker.cpp
OpalMarker.cpp
OpalMonitor.cpp
OpalMultipole.cpp
OpalMultipoleT.cpp
OpalMultipoleTStraight.cpp
OpalMultipoleTCurvedConstRadius.cpp
OpalMultipoleTCurvedVarRadius.cpp
OpalOctupole.cpp
OpalOffset/OpalLocalCylindricalOffset.cpp
OpalOffset/OpalLocalCartesianOffset.cpp
OpalOffset/OpalGlobalCylindricalOffset.cpp
OpalOffset/OpalGlobalCartesianOffset.cpp
OpalPatch.cpp
OpalProbe.cpp
OpalPepperPot.cpp
OpalPolynomialTimeDependence.cpp
OpalQuadrupole.cpp
OpalRBend.cpp
OpalRBend3D.cpp
OpalRCollimator.cpp
OpalRingDefinition.cpp
OpalSBend.cpp
OpalSBend3D.cpp
OpalScalingFFAMagnet.cpp
OpalSeparator.cpp
OpalSeptum.cpp
OpalSextupole.cpp
OpalSlit.cpp
OpalSolenoid.cpp
OpalSource.cpp
OpalSplineTimeDependence.cpp
OpalSRot.cpp
OpalVariableRFCavity.cpp
OpalVariableRFCavityFringeField.cpp
OpalVKicker.cpp
OpalVMonitor.cpp
OpalYRot.cpp
OpalBeamline.cpp
OpalParallelPlate.cpp
OpalCyclotronValley.cpp
OpalStripper.cpp
)
AttCell.cpp
OpalBeamStripping.cpp
OpalBend.cpp
OpalCavity.cpp
OpalTravelingWave.cpp
OpalCCollimator.cpp
OpalCyclotron.cpp
OpalDrift.cpp
OpalECollimator.cpp
OpalFlexibleCollimator.cpp
OpalDegrader.cpp
OpalElement.cpp
OpalHKicker.cpp
OpalHMonitor.cpp
OpalInstrument.cpp
OpalKicker.cpp
OpalMarker.cpp
OpalMonitor.cpp
OpalMultipole.cpp
OpalMultipoleT.cpp
OpalMultipoleTStraight.cpp
OpalMultipoleTCurvedConstRadius.cpp
OpalMultipoleTCurvedVarRadius.cpp
OpalOctupole.cpp
OpalOffset/OpalLocalCylindricalOffset.cpp
OpalOffset/OpalLocalCartesianOffset.cpp
OpalOffset/OpalGlobalCylindricalOffset.cpp
OpalOffset/OpalGlobalCartesianOffset.cpp
OpalPatch.cpp
OpalProbe.cpp
OpalPepperPot.cpp
OpalPolynomialTimeDependence.cpp
OpalQuadrupole.cpp
OpalRBend.cpp
OpalRBend3D.cpp
OpalRCollimator.cpp
OpalRingDefinition.cpp
OpalSBend.cpp
OpalSBend3D.cpp
OpalScalingFFAMagnet.cpp
OpalSeparator.cpp
OpalSeptum.cpp
OpalSextupole.cpp
OpalSlit.cpp
OpalSolenoid.cpp
OpalSource.cpp
OpalSplineTimeDependence.cpp
OpalSRot.cpp
OpalVariableRFCavity.cpp
OpalVariableRFCavityFringeField.cpp
OpalVKicker.cpp
OpalVMonitor.cpp
OpalYRot.cpp
OpalBeamline.cpp
OpalParallelPlate.cpp
OpalCyclotronValley.cpp
OpalStripper.cpp
)
include_directories (
${CMAKE_CURRENT_SOURCE_DIR}
)
${CMAKE_CURRENT_SOURCE_DIR}
)
add_opal_sources(${_SRCS})
add_opal_sources (${_SRCS})
set (HDRS
AttCell.h
......@@ -121,6 +121,14 @@ set (HDRS
OpalOffset/OpalGlobalCylindricalOffset.h
OpalOffset/OpalLocalCartesianOffset.h
OpalOffset/OpalLocalCylindricalOffset.h
)
)
install (FILES ${HDRS} DESTINATION "${CMAKE_INSTALL_PREFIX}/include/Elements/OpalOffset")
# vi: set et ts=4 sw=4 sts=4:
# Local Variables:
# mode: cmake
# cmake-tab-width: 4
# indent-tabs-mode: nil
# End:
......@@ -6,13 +6,13 @@ set (_SRCS
SCell.cpp
SFunction.cpp
SHash.cpp
)
)
include_directories (
${CMAKE_CURRENT_SOURCE_DIR}
)
${CMAKE_CURRENT_SOURCE_DIR}
)
add_opal_sources(${_SRCS})
add_opal_sources (${_SRCS})
set (HDRS
AAutomatic.h
......@@ -45,6 +45,14 @@ set (HDRS
TFunction0.h
TFunction1.h
TFunction2.h
)
)
install (FILES ${HDRS} DESTINATION "${CMAKE_INSTALL_PREFIX}/include/Expressions")