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
......@@ -48,3 +48,11 @@ set (HDRS
)
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:
......@@ -4,12 +4,20 @@ set (_SRCS
include_directories (
${CMAKE_CURRENT_SOURCE_DIR}
)
)
add_opal_sources(${_SRCS})
set (HDRS
QRSolver.h
)
)
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:
......@@ -33,7 +33,7 @@ set (_SRCS
include_directories (
${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")
# 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}
)
)
add_opal_sources(${_SRCS})
add_compile_options (-Wno-unused-variable
-Wno-unused-but-set-variable
-Wno-maybe-uninitialized)
-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")
# vi: set et ts=4 sw=4 sts=4:
# Local Variables:
# mode: cmake
# cmake-tab-width: 4
# indent-tabs-mode: nil
# End:
......@@ -5,13 +5,21 @@ set (_SRCS
include_directories (
${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")
# 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}
)
)
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")
# vi: set et ts=4 sw=4 sts=4:
# Local Variables:
# mode: cmake
# cmake-tab-width: 4
# indent-tabs-mode: nil
# End:
......@@ -20,7 +20,7 @@ set (_SRCS
include_directories (
${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;
}
}
......
......@@ -5,7 +5,7 @@ set (_SRCS
include_directories (
${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")
# vi: set et ts=4 sw=4 sts=4:
# Local Variables:
# mode: cmake
# cmake-tab-width: 4
# indent-tabs-mode: nil
# End:
......@@ -15,7 +15,7 @@ set (_SRCS
include_directories (
${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")
# vi: set et ts=4 sw=4 sts=4:
# Local Variables:
# mode: cmake
# cmake-tab-width: 4
# indent-tabs-mode: nil
# End:
......@@ -60,9 +60,9 @@ set (_SRCS
include_directories (
${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}
)
)
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")
# vi: set et ts=4 sw=4 sts=4:
# Local Variables:
# mode: cmake
# cmake-tab-width: 4
# indent-tabs-mode: nil
# End:
......@@ -11,7 +11,7 @@ set (_SRCS
include_directories (
${CMAKE_CURRENT_SOURCE_DIR}
)
)
add_opal_sources(${_SRCS})
......@@ -24,6 +24,14 @@ set (HDRS
SequenceMember.h
SequenceParser.h
SequenceTemplate.h
)
)
install (FILES ${HDRS} DESTINATION "${CMAKE_INSTALL_PREFIX}/include/Lines")
# vi: set et ts=4 sw=4 sts=4:
# Local Variables:
# mode: cmake
# cmake-tab-width: 4
# indent-tabs-mode: nil
# End:
......@@ -13,11 +13,11 @@ set (_SRCS
Migrad.cpp
Simplex.cpp
VaryCmd.cpp
)
)
include_directories (
${CMAKE_CURRENT_SOURCE_DIR}
)
)
add_opal_sources(${_SRCS})
......@@ -38,6 +38,14 @@ set (HDRS
Migrad.h
Simplex.h
VaryCmd.h
)
)
install (FILES ${HDRS} DESTINATION "${CMAKE_INSTALL_PREFIX}/include/Match")
# vi: set et ts=4 sw=4 sts=4:
# Local Variables:
# mode: cmake
# cmake-tab-width: 4
# indent-tabs-mode: nil
# End:
......@@ -4,12 +4,20 @@ set (_SRCS
include_directories (
${CMAKE_CURRENT_SOURCE_DIR}
)
)
add_opal_sources(${_SRCS})
add_opal_sources (${_SRCS})
set (HDRS
Configure.h
)
)
install (FILES ${HDRS} DESTINATION "${CMAKE_INSTALL_PREFIX}/include/OpalConfigure")
# vi: set et ts=4 sw=4 sts=4:
# Local Variables:
# mode: cmake
# cmake-tab-width: 4
# indent-tabs-mode: nil
# End:
......@@ -10,7 +10,7 @@ set (_SRCS
include_directories (
${CMAKE_CURRENT_SOURCE_DIR}
)
)
add_opal_sources(${_SRCS})
......@@ -22,6 +22,14 @@ set (HDRS
MacroStream.h
OpalParser.h
WhileStatement.h
)
)
install (FILES ${HDRS} DESTINATION "${CMAKE_INSTALL_PREFIX}/include/OpalParser")
# vi: set et ts=4 sw=4 sts=4:
# Local Variables:
# mode: cmake
# cmake-tab-width: 4
# indent-tabs-mode: nil
# End:
......@@ -8,7 +8,7 @@ set (_SRCS
include_directories (
${CMAKE_CURRENT_SOURCE_DIR}
)
)
add_opal_sources(${_SRCS})
......@@ -17,6 +17,14 @@ set (HDRS
DVar.h
Objective.h
Constraint.h
)
)
install (FILES ${HDRS} DESTINATION "${CMAKE_INSTALL_PREFIX}/include/Optimize")
# vi: set et ts=4 sw=4 sts=4:
# Local Variables:
# mode: cmake
# cmake-tab-width: 4
# indent-tabs-mode: nil
# End:
......@@ -7,7 +7,7 @@ set (_SRCS
include_directories (
${CMAKE_CURRENT_SOURCE_DIR}
)
)
add_opal_sources(${_SRCS})
......@@ -16,6 +16,14 @@ set (HDRS
MakeSequence.h
SetIntegrator.h
Static.h
)
)
install (FILES ${HDRS} DESTINATION "${CMAKE_INSTALL_PREFIX}/include/PhysicsActions")
# vi: set et ts=4 sw=4 sts=4:
# Local Variables:
# mode: cmake
# cmake-tab-width: 4
# indent-tabs-mode: nil
# End:
......@@ -7,7 +7,7 @@ set (_SRCS
include_directories (
${CMAKE_CURRENT_SOURCE_DIR}
)
)
add_opal_sources(${_SRCS})
......@@ -27,6 +27,14 @@ set (HDRS
SampleWorker.h
SamplingMethod.h
Uniform.h
)
)
install (FILES ${HDRS} DESTINATION "${CMAKE_INSTALL_PREFIX}/include/Sample")
# vi: set et ts=4 sw=4 sts=4:
# Local Variables:
# mode: cmake
# cmake-tab-width: 4
# indent-tabs-mode: nil
# End:
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment