Commit 080163d9 authored by gsell's avatar gsell
Browse files

Cleanup CMakeLists.txt in IPPL

parent 33008b70
SET(${PROJECT_NAME}_CMAKE_CXX_FLAGS "${${PROJECT_NAME}_CXX_FLAGS}") set (${PROJECT_NAME}_CMAKE_CXX_FLAGS "${${PROJECT_NAME}_CXX_FLAGS}")
SET(${PROJECT_NAME}_INCLUDE_DIR "${CMAKE_INSTALL_PREFIX}/include") set (${PROJECT_NAME}_INCLUDE_DIR "${CMAKE_INSTALL_PREFIX}/include")
SET(${PROJECT_NAME}_LIBRARY_DIR "${CMAKE_INSTALL_PREFIX}/lib") set (${PROJECT_NAME}_LIBRARY_DIR "${CMAKE_INSTALL_PREFIX}/lib")
SET(${PROJECT_NAME}_LIBRARY "ippl") set (${PROJECT_NAME}_LIBRARY "ippl")
\ No newline at end of file
SET (_SRCS set (_SRCS
) )
SET (_HDRS set (_HDRS
ParticleAmrLayout.h ParticleAmrLayout.h
AmrParticleBase.h AmrParticleBase.h
AmrParticleBase.hpp AmrParticleBase.hpp
AmrParticleLevelCounter.h AmrParticleLevelCounter.h
) )
INCLUDE_DIRECTORIES ( include_directories (
${CMAKE_CURRENT_SOURCE_DIR} ${CMAKE_CURRENT_SOURCE_DIR}
) )
ADD_IPPL_SOURCES (${_SRCS}) ADD_IPPL_SOURCES (${_SRCS})
ADD_IPPL_HEADERS (${_HDRS}) ADD_IPPL_HEADERS (${_HDRS})
INSTALL (FILES ${_HDRS} DESTINATION include/AmrParticle) install (FILES ${_HDRS} DESTINATION include/AmrParticle)
# 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
) )
SET (_HDRS set (_HDRS
AntiSymTenzor.h AntiSymTenzor.h
AppTypeTraits.h AppTypeTraits.h
dcomplex.h dcomplex.h
...@@ -19,11 +19,20 @@ SET (_HDRS ...@@ -19,11 +19,20 @@ SET (_HDRS
Vektor.h Vektor.h
) )
INCLUDE_DIRECTORIES ( include_directories (
${CMAKE_CURRENT_SOURCE_DIR} ${CMAKE_CURRENT_SOURCE_DIR}
) )
ADD_IPPL_SOURCES (${_SRCS}) add_ippl_sources (${_SRCS})
ADD_IPPL_HEADERS (${_HDRS}) add_ippl_headers (${_HDRS})
install (FILES ${_HDRS} DESTINATION include/AppTypes)
# vi: set et ts=4 sw=4 sts=4:
# Local Variables:
# mode: cmake
# cmake-tab-width: 4
# indent-tabs-mode: nil
# End:
INSTALL (FILES ${_HDRS} DESTINATION include/AppTypes)
...@@ -23,47 +23,6 @@ set (IPPL_COMPILE_USER \"${WHOAMI_OUT}\") ...@@ -23,47 +23,6 @@ set (IPPL_COMPILE_USER \"${WHOAMI_OUT}\")
configure_file (IpplVersions.h.in ${CMAKE_CURRENT_SOURCE_DIR}/IpplVersions.h) configure_file (IpplVersions.h.in ${CMAKE_CURRENT_SOURCE_DIR}/IpplVersions.h)
if (UNUSED)
### print the compiler flags #############################
set (PRETTY_PRINT_WIDTH 78)
string (TOUPPER ${CMAKE_BUILD_TYPE} CMAKE_BUILD_TYPE_STR)
set (COMPILE_FLAGS_STR
"${CMAKE_CXX_FLAGS} ${CMAKE_CXX_FLAGS_${CMAKE_BUILD_TYPE_STR}}")
string (REGEX REPLACE " +" ";" COMPILE_FLAGS_LIST ${COMPILE_FLAGS_STR})
list (LENGTH COMPILE_FLAGS_LIST NUMBER_OF_COMPILE_FLAGS)
set (CURRENT_FLAG_INDEX 0)
message ("")
message ("Building IPPL with:")
while (${CURRENT_FLAG_INDEX} LESS ${NUMBER_OF_COMPILE_FLAGS})
set (FLAGS_PRETTY_PRINT "")
list (GET COMPILE_FLAGS_LIST ${CURRENT_FLAG_INDEX} CURRENT_FLAG)
string (LENGTH ${CURRENT_FLAG} LENGTH_INCL_NEXT)
while (${LENGTH_INCL_NEXT} LESS ${PRETTY_PRINT_WIDTH})
set (FLAGS_PRETTY_PRINT
"${FLAGS_PRETTY_PRINT} ${CURRENT_FLAG}")
math (EXPR CURRENT_FLAG_INDEX "(${CURRENT_FLAG_INDEX} + 1)")
if (${CURRENT_FLAG_INDEX} EQUAL ${NUMBER_OF_COMPILE_FLAGS})
set (LENGTH_INCL_NEXT ${PRETTY_PRINT_WIDTH})
else (${CURRENT_FLAG_INDEX} EQUAL ${NUMBER_OF_COMPILE_FLAGS})
list (GET COMPILE_FLAGS_LIST ${CURRENT_FLAG_INDEX} CURRENT_FLAG)
if (CURRENT_FLAG)
string (LENGTH ${CURRENT_FLAG} LENGTH_CURRENT_FLAG)
math (EXPR LENGTH_INCL_NEXT "${LENGTH_INCL_NEXT} + 1 + ${LENGTH_CURRENT_FLAG}")
endif ()
endif ()
endwhile ()
string (STRIP ${FLAGS_PRETTY_PRINT} FLAGS_PRETTY_PRINT)
message (STATUS "${FLAGS_PRETTY_PRINT}")
endwhile ()
message ("")
endif ()
set (IPPL_SRC_DIR ${CMAKE_CURRENT_SOURCE_DIR}) set (IPPL_SRC_DIR ${CMAKE_CURRENT_SOURCE_DIR})
macro (add_ippl_sources) macro (add_ippl_sources)
file (RELATIVE_PATH _relPath "${IPPL_SRC_DIR}" "${CMAKE_CURRENT_SOURCE_DIR}") file (RELATIVE_PATH _relPath "${IPPL_SRC_DIR}" "${CMAKE_CURRENT_SOURCE_DIR}")
...@@ -147,6 +106,7 @@ install (TARGETS ippl DESTINATION lib) ...@@ -147,6 +106,7 @@ install (TARGETS ippl DESTINATION lib)
install (FILES ${IPPL_BASEDIR_HDRS} DESTINATION include) install (FILES ${IPPL_BASEDIR_HDRS} DESTINATION include)
# vi: set et ts=4 sw=4 sts=4: # vi: set et ts=4 sw=4 sts=4:
# Local Variables: # Local Variables:
# mode:cmake # mode:cmake
# cmake-tab-width: 4 # cmake-tab-width: 4
......
SET (_SRCS set (_SRCS
DataSource.cpp DataSource.cpp
DataConnect.cpp DataConnect.cpp
DataConnectCreator.cpp DataConnectCreator.cpp
...@@ -7,7 +7,7 @@ SET (_SRCS ...@@ -7,7 +7,7 @@ SET (_SRCS
PtclBaseDataSource.cpp PtclBaseDataSource.cpp
) )
SET (_HDRS set (_HDRS
DataConnectCreator.h DataConnectCreator.h
DataConnect.h DataConnect.h
DataSource.h DataSource.h
...@@ -31,11 +31,19 @@ SET (_HDRS ...@@ -31,11 +31,19 @@ SET (_HDRS
StringDataSource.h StringDataSource.h
) )
INCLUDE_DIRECTORIES ( include_directories (
${CMAKE_CURRENT_SOURCE_DIR} ${CMAKE_CURRENT_SOURCE_DIR}
) )
ADD_IPPL_SOURCES (${_SRCS}) ADD_IPPL_SOURCES (${_SRCS})
ADD_IPPL_HEADERS (${_HDRS}) ADD_IPPL_HEADERS (${_HDRS})
INSTALL (FILES ${_HDRS} DESTINATION include/DataSource) install (FILES ${_HDRS} DESTINATION include/DataSource)
# 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
) )
SET (_HDRS set (_HDRS
DomainMap.hpp DomainMap.hpp
DomainMap.h DomainMap.h
) )
INCLUDE_DIRECTORIES ( include_directories (
${CMAKE_CURRENT_SOURCE_DIR} ${CMAKE_CURRENT_SOURCE_DIR}
) )
ADD_IPPL_SOURCES (${_SRCS}) add_ippl_sources (${_SRCS})
ADD_IPPL_HEADERS (${_HDRS}) add_ippl_headers (${_HDRS})
INSTALL (FILES ${_HDRS} DESTINATION include/DomainMap) install (FILES ${_HDRS} DESTINATION include/DomainMap)
# 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
fftpack.cpp fftpack.cpp
) )
set (_HDRS set (_HDRS
FFTBase.hpp FFTBase.hpp
FFTBase.h FFTBase.h
FFT.hpp FFT.hpp
FFT.h FFT.h
fftpack_FFT.h fftpack_FFT.h
) )
include_directories ( include_directories (
${CMAKE_CURRENT_SOURCE_DIR} ${CMAKE_CURRENT_SOURCE_DIR}
) )
add_ippl_sources (${_SRCS}) add_ippl_sources (${_SRCS})
add_ippl_headers (${_HDRS}) add_ippl_headers (${_HDRS})
#install (FILES ${_HDRS} DESTINATION include/FFT) # 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
) )
SET (_HDRS set (_HDRS
Assign.hpp Assign.hpp
AssignDefs.h AssignDefs.h
AssignGeneralBF.hpp AssignGeneralBF.hpp
AssignGeneralIBF.hpp AssignGeneralIBF.hpp
Assign.h Assign.h
AssignTags.h AssignTags.h
BareField.hpp BareField.hpp
BareField.h BareField.h
BareFieldIterator.h BareFieldIterator.h
BCond.hpp BCond.hpp
BCond.h BCond.h
BrickExpression.hpp BrickExpression.hpp
BrickExpression.h BrickExpression.h
BrickIterator.hpp BrickIterator.hpp
BrickIterator.h BrickIterator.h
CompressedBrickIterator.hpp CompressedBrickIterator.hpp
CompressedBrickIterator.h CompressedBrickIterator.h
Field.hpp Field.hpp
Field.h Field.h
FieldLoc.h FieldLoc.h
FieldSpec.h FieldSpec.h
GuardCellSizes.hpp GuardCellSizes.hpp
GuardCellSizes.h GuardCellSizes.h
IndexedBareField.hpp IndexedBareField.hpp
IndexedBareField.h IndexedBareField.h
IndexedField.h IndexedField.h
LField.hpp LField.hpp
LField.h LField.h
ReductionLoc.hpp ReductionLoc.hpp
ReductionLoc.h ReductionLoc.h
) )
INCLUDE_DIRECTORIES ( include_DIRECTORIES (
${CMAKE_CURRENT_SOURCE_DIR} ${CMAKE_CURRENT_SOURCE_DIR}
) )
ADD_IPPL_SOURCES (${_SRCS}) add_ippl_sources (${_SRCS})
ADD_IPPL_HEADERS (${_HDRS}) add_ippl_headers (${_HDRS})
INSTALL (FILES ${_HDRS} DESTINATION include/Field) install (FILES ${_HDRS} DESTINATION include/Field)
# 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
FieldLayoutUser.cpp FieldLayoutUser.cpp
MultiBalancer.cpp MultiBalancer.cpp
VRB.cpp VRB.cpp
) )
SET (_HDRS set (_HDRS
BinaryBalancer.hpp BinaryBalancer.hpp
BinaryBalancer.h BinaryBalancer.h
CenteredFieldLayout.hpp CenteredFieldLayout.hpp
...@@ -21,11 +21,19 @@ SET (_HDRS ...@@ -21,11 +21,19 @@ SET (_HDRS
VRB.h VRB.h
) )
INCLUDE_DIRECTORIES ( include_DIRECTORIES (
${CMAKE_CURRENT_SOURCE_DIR} ${CMAKE_CURRENT_SOURCE_DIR}
) )
ADD_IPPL_SOURCES (${_SRCS}) ADD_IPPL_SOURCES (${_SRCS})
ADD_IPPL_HEADERS (${_HDRS}) ADD_IPPL_HEADERS (${_HDRS})
INSTALL (FILES ${_HDRS} DESTINATION include/FieldLayout) install (FILES ${_HDRS} DESTINATION include/FieldLayout)
# vi: set et ts=4 sw=4 sts=4:
# Local Variables:
# mode: cmake
# cmake-tab-width: 4
# indent-tabs-mode: nil
# End:
...@@ -38,7 +38,7 @@ std::ostream& operator<<(std::ostream&, const Vnode<Dim>&); ...@@ -38,7 +38,7 @@ std::ostream& operator<<(std::ostream&, const Vnode<Dim>&);
//---------------------------------------------------------------------- //----------------------------------------------------------------------
template<unsigned Dim> template<unsigned Dim>
class Vnode : public RefCounted, public Pooled< Vnode<Dim> > class Vnode : public RefCounted //, public Pooled< Vnode<Dim> >
{ {
private: private:
......
SET (_SRCS set (_SRCS
Index.cpp Index.cpp
) )
SET (_HDRS set (_HDRS
IndexedSIndex.h IndexedSIndex.h
Index.h Index.h
IndexInlines.h IndexInlines.h
LSIndex.h LSIndex.h
NDIndex.h NDIndex.h
NDIndexInlines.h NDIndexInlines.h
SIndexAssign.hpp SIndexAssign.hpp
SIndexAssign.h SIndexAssign.h
SIndex.hpp SIndex.hpp
SIndex.h SIndex.h
SOffset.h SOffset.h
) )
INCLUDE_DIRECTORIES ( include_directories (
${CMAKE_CURRENT_SOURCE_DIR} ${CMAKE_CURRENT_SOURCE_DIR}
) )
ADD_IPPL_SOURCES (${_SRCS}) ADD_IPPL_SOURCES (${_SRCS})
ADD_IPPL_HEADERS (${_HDRS}) ADD_IPPL_HEADERS (${_HDRS})
INSTALL (FILES ${_HDRS} DESTINATION include/Index) install (FILES ${_HDRS} DESTINATION include/Index)
# 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
Centering.cpp Centering.cpp
) )
SET (_HDRS set (_HDRS
CartesianCentering.hpp CartesianCentering.hpp
CartesianCentering.h CartesianCentering.h
Cartesian.hpp Cartesian.hpp
Cartesian.h Cartesian.h
CartesianStencilSetup.h CartesianStencilSetup.h
Centering.h Centering.h
Mesh.hpp Mesh.hpp
Mesh.h Mesh.h
UniformCartesian.hpp UniformCartesian.hpp
UniformCartesian.h UniformCartesian.h
) )
INCLUDE_DIRECTORIES ( include_directories (
${CMAKE_CURRENT_SOURCE_DIR} ${CMAKE_CURRENT_SOURCE_DIR}
) )
ADD_IPPL_SOURCES (${_SRCS}) ADD_IPPL_SOURCES (${_SRCS})
ADD_IPPL_HEADERS (${_HDRS}) ADD_IPPL_HEADERS (${_HDRS})
INSTALL (FILES ${_HDRS} DESTINATION include/Meshes) install (FILES ${_HDRS} DESTINATION include/Meshes)
# 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
CRC.cpp CRC.cpp
Communicate.cpp Communicate.cpp
CommCreator.cpp CommCreator.cpp
CommMPI.cpp CommMPI.cpp
MessageFunctions.cpp MessageFunctions.cpp
Formatter.cpp Formatter.cpp
) )
SET (_HDRS set (_HDRS
CommCreator.h CommCreator.h
CommMPI.h CommMPI.h
CommPM.h CommPM.h
CommSHMEMPI.h CommSHMEMPI.h
Communicate.h Communicate.h
CRC.h CRC.h
DataTypes.h DataTypes.h
Formatter.h Formatter.h
GlobalComm.hpp GlobalComm.hpp
GlobalComm.h GlobalComm.h
Message.hpp Message.hpp
Message.h Message.h
Operations.h Operations.h
TagMaker.h TagMaker.h
Tags.h Tags.h
) )
INCLUDE_DIRECTORIES ( include_directories (
${CMAKE_CURRENT_SOURCE_DIR} ${CMAKE_CURRENT_SOURCE_DIR}
) )
ADD_IPPL_SOURCES (${_SRCS}) add_ippl_sources (${_SRCS})
ADD_IPPL_HEADERS (${_HDRS}) add_ippl_headers (${_HDRS})
INSTALL (FILES ${_HDRS} DESTINATION include/Message) install (FILES ${_HDRS} DESTINATION include/Message)
# 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
) )
SET (_HDRS set (_HDRS
IpplExpressions.h