Skip to content
Snippets Groups Projects
Commit 941e1233 authored by Praetorius, Simon's avatar Praetorius, Simon
Browse files

added some more install files in CMakeLists

parent 1681e00a
No related branches found
No related tags found
No related merge requests found
...@@ -17,26 +17,14 @@ dune_enable_all_packages(MODULE_LIBRARIES amdis) ...@@ -17,26 +17,14 @@ dune_enable_all_packages(MODULE_LIBRARIES amdis)
include(AmdisMacros) include(AmdisMacros)
add_subdirectory("src") add_subdirectory("src")
add_subdirectory("test") add_subdirectory("test")
add_subdirectory("examples") add_subdirectory("examples" EXCLUDE_FROM_ALL)
add_subdirectory("doc") add_subdirectory("doc")
add_subdirectory("cmake/modules") add_subdirectory("cmake/modules")
target_include_directories(amdis PUBLIC
# some additional packages and flags $<BUILD_INTERFACE:${CMAKE_SOURCE_DIR}/src>)
find_package(MTL REQUIRED target_compile_definitions(amdis PUBLIC AMDIS_BACKEND_MTL=1)
PATHS /usr/local/lib/mtl4 /opt/sources/mtl4 /opt/development/mtl4) target_compile_options(amdis PUBLIC -Wall -pedantic -Wno-unused-parameter) #-ftemplate-backtrace-limit=0
if (MTL_FOUND)
target_include_directories(amdis PUBLIC ${MTL_INCLUDE_DIRS})
set (CXX_ELEVEN_FEATURE_LIST "MOVE" "AUTO" "RANGEDFOR" "INITLIST" "STATICASSERT" "DEFAULTIMPL")
foreach (feature ${CXX_ELEVEN_FEATURE_LIST})
target_compile_definitions(amdis PUBLIC MTL_WITH_${feature})
endforeach ()
if (HAVE_UMFPACK OR ENABLE_SUITESPARSE OR SuiteSparse_FOUND)
target_compile_definitions(amdis PUBLIC MTL_HAS_UMFPACK)
endif ()
endif (MTL_FOUND)
# finalize the dune project, e.g. generating config.h etc. # finalize the dune project, e.g. generating config.h etc.
finalize_dune_project(GENERATE_CONFIG_H_CMAKE) finalize_dune_project(GENERATE_CONFIG_H_CMAKE)
File moved
...@@ -2,5 +2,20 @@ ...@@ -2,5 +2,20 @@
include(AMDiSCXXFeatures) include(AMDiSCXXFeatures)
#find_package(SuiteSparse) # some additional packages and flags
#find_package(Alberta) find_package(MTL REQUIRED
\ No newline at end of file PATHS /usr/local/lib/mtl4 /opt/sources/mtl4 /opt/development/mtl4)
set(CXX_ELEVEN_FEATURE_LIST "MOVE" "AUTO" "RANGEDFOR" "INITLIST" "STATICASSERT" "DEFAULTIMPL")
set(MTL_COMPILE_DEFINITIONS "")
foreach(feature ${CXX_ELEVEN_FEATURE_LIST})
list(APPEND MTL_COMPILE_DEFINITIONS "MTL_WITH_${feature}")
endforeach()
if(HAVE_UMFPACK OR ENABLE_SUITESPARSE OR SuiteSparse_FOUND)
list(APPEND MTL_COMPILE_DEFINITIONS "MTL_HAS_UMFPACK")
endif()
dune_register_package_flags(
COMPILE_DEFINITIONS ${MTL_COMPILE_DEFINITIONS}
INCLUDE_DIRS ${MTL_INCLUDE_DIRS})
set(modules "AmdisMacros.cmake")
install(FILES ${modules} DESTINATION ${DUNE_INSTALL_MODULEDIR}) install(FILES
AmdisMacros.cmake
AMDiSCXXFeatures.cmake
DESTINATION ${DUNE_INSTALL_MODULEDIR})
...@@ -13,7 +13,6 @@ dune_library_add_sources(amdis SOURCES ...@@ -13,7 +13,6 @@ dune_library_add_sources(amdis SOURCES
ProblemStat.cpp ProblemStat.cpp
StandardProblemIteration.cpp StandardProblemIteration.cpp
) )
link_libraries(amdis)
install(FILES install(FILES
AdaptBase.hpp AdaptBase.hpp
......
...@@ -6,14 +6,17 @@ install(FILES ...@@ -6,14 +6,17 @@ install(FILES
Concepts.hpp Concepts.hpp
ConceptsBase.hpp ConceptsBase.hpp
FieldMatVec.hpp FieldMatVec.hpp
FieldTraits.hpp
IndexSeq.hpp IndexSeq.hpp
Literals.hpp Literals.hpp
Loops.hpp Loops.hpp
Math.hpp Math.hpp
Mpl.hpp Mpl.hpp
MultiTypeMatrix.hpp
MultiTypeVector.hpp MultiTypeVector.hpp
ScalarTypes.hpp ScalarTypes.hpp
Size.hpp Size.hpp
Tags.hpp
TupleUtility.hpp TupleUtility.hpp
TypeDefs.hpp TypeDefs.hpp
Utility.hpp Utility.hpp
......
...@@ -4,6 +4,7 @@ install(FILES ...@@ -4,6 +4,7 @@ install(FILES
HierarchicWrapper.hpp HierarchicWrapper.hpp
LinearAlgebraBase.hpp LinearAlgebraBase.hpp
LinearSolverInterface.hpp LinearSolverInterface.hpp
Mtl.hpp
PreconditionerInterface.hpp PreconditionerInterface.hpp
RunnerInterface.hpp RunnerInterface.hpp
SolverInfo.hpp SolverInfo.hpp
......
#install headers #install headers
target_include_directories(amdis PUBLIC
$<BUILD_INTERFACE:${CMAKE_SOURCE_DIR}/src>)
target_compile_definitions(amdis PUBLIC AMDIS_BACKEND_MTL=1)
target_compile_options(amdis PUBLIC -Wall -pedantic -Wno-unused-parameter) #-ftemplate-backtrace-limit=0
dune_library_add_sources(amdis SOURCES dune_library_add_sources(amdis SOURCES
Filesystem.cpp Filesystem.cpp
) )
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment