Skip to content
GitLab
Projects
Groups
Snippets
Help
Loading...
Help
What's new
7
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
Open sidebar
amdis
amdis-core
Commits
941e1233
Commit
941e1233
authored
Jan 28, 2018
by
Praetorius, Simon
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
added some more install files in CMakeLists
parent
1681e00a
Changes
8
Hide whitespace changes
Inline
Side-by-side
Showing
8 changed files
with
30 additions
and
27 deletions
+30
-27
CMakeLists.txt
CMakeLists.txt
+5
-17
amdis.pc.in
amdis.pc.in
+0
-0
cmake/modules/AmdisMacros.cmake
cmake/modules/AmdisMacros.cmake
+17
-2
cmake/modules/CMakeLists.txt
cmake/modules/CMakeLists.txt
+4
-2
src/amdis/CMakeLists.txt
src/amdis/CMakeLists.txt
+0
-1
src/amdis/common/CMakeLists.txt
src/amdis/common/CMakeLists.txt
+3
-0
src/amdis/linear_algebra/CMakeLists.txt
src/amdis/linear_algebra/CMakeLists.txt
+1
-0
src/amdis/utility/CMakeLists.txt
src/amdis/utility/CMakeLists.txt
+0
-5
No files found.
CMakeLists.txt
View file @
941e1233
...
...
@@ -17,26 +17,14 @@ dune_enable_all_packages(MODULE_LIBRARIES amdis)
include
(
AmdisMacros
)
add_subdirectory
(
"src"
)
add_subdirectory
(
"test"
)
add_subdirectory
(
"examples"
)
add_subdirectory
(
"examples"
EXCLUDE_FROM_ALL
)
add_subdirectory
(
"doc"
)
add_subdirectory
(
"cmake/modules"
)
# some additional packages and flags
find_package
(
MTL REQUIRED
PATHS /usr/local/lib/mtl4 /opt/sources/mtl4 /opt/development/mtl4
)
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
)
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
# finalize the dune project, e.g. generating config.h etc.
finalize_dune_project
(
GENERATE_CONFIG_H_CMAKE
)
dune-
amdis.pc.in
→
amdis.pc.in
View file @
941e1233
File moved
cmake/modules/AmdisMacros.cmake
View file @
941e1233
...
...
@@ -2,5 +2,20 @@
include
(
AMDiSCXXFeatures
)
#find_package(SuiteSparse)
#find_package(Alberta)
\ No newline at end of file
# some additional packages and flags
find_package
(
MTL REQUIRED
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
}
)
cmake/modules/CMakeLists.txt
View file @
941e1233
set
(
modules
"AmdisMacros.cmake"
)
install
(
FILES
${
modules
}
DESTINATION
${
DUNE_INSTALL_MODULEDIR
}
)
install
(
FILES
AmdisMacros.cmake
AMDiSCXXFeatures.cmake
DESTINATION
${
DUNE_INSTALL_MODULEDIR
}
)
src/amdis/CMakeLists.txt
View file @
941e1233
...
...
@@ -13,7 +13,6 @@ dune_library_add_sources(amdis SOURCES
ProblemStat.cpp
StandardProblemIteration.cpp
)
link_libraries
(
amdis
)
install
(
FILES
AdaptBase.hpp
...
...
src/amdis/common/CMakeLists.txt
View file @
941e1233
...
...
@@ -6,14 +6,17 @@ install(FILES
Concepts.hpp
ConceptsBase.hpp
FieldMatVec.hpp
FieldTraits.hpp
IndexSeq.hpp
Literals.hpp
Loops.hpp
Math.hpp
Mpl.hpp
MultiTypeMatrix.hpp
MultiTypeVector.hpp
ScalarTypes.hpp
Size.hpp
Tags.hpp
TupleUtility.hpp
TypeDefs.hpp
Utility.hpp
...
...
src/amdis/linear_algebra/CMakeLists.txt
View file @
941e1233
...
...
@@ -4,6 +4,7 @@ install(FILES
HierarchicWrapper.hpp
LinearAlgebraBase.hpp
LinearSolverInterface.hpp
Mtl.hpp
PreconditionerInterface.hpp
RunnerInterface.hpp
SolverInfo.hpp
...
...
src/amdis/utility/CMakeLists.txt
View file @
941e1233
#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
Filesystem.cpp
)
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
.
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment