Commit 4692927b authored by gsell's avatar gsell

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

Resolve "Cleanup in other CMakeLists.txt"

Closes #397

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