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
Aland, Sebastian
amdis
Commits
42deb9ac
Commit
42deb9ac
authored
Feb 22, 2016
by
Praetorius, Simon
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
another CMakeLists correction
parent
87169e40
Changes
5
Hide whitespace changes
Inline
Side-by-side
Showing
5 changed files
with
15 additions
and
12 deletions
+15
-12
AMDiS/cmake3/AMDISConfig.cmake.in
AMDiS/cmake3/AMDISConfig.cmake.in
+3
-0
AMDiS/cmake3/amdis_extensions.cmake
AMDiS/cmake3/amdis_extensions.cmake
+8
-8
AMDiS/cmake3/find_boost.cmake
AMDiS/cmake3/find_boost.cmake
+2
-2
AMDiS/cmake3/find_petsc.cmake
AMDiS/cmake3/find_petsc.cmake
+1
-1
AMDiS/cmake3/find_umfpack.cmake
AMDiS/cmake3/find_umfpack.cmake
+1
-1
No files found.
AMDiS/cmake3/AMDISConfig.cmake.in
View file @
42deb9ac
...
...
@@ -137,6 +137,9 @@ if (AMDIS_NEED_EXTENSIONS)
find_library(_EXTENSIONS_LIB amdis_extensions PATHS ${AMDIS_DIR}/../../lib/amdis/)
if (_EXTENSIONS_LIB)
target_include_directories(amdis_base INTERFACE ${AMDIS_INCLUDE_DIR}/extensions)
target_include_directories(amdis_base INTERFACE ${AMDIS_INCLUDE_DIR}/extensions/nanoflann)
target_include_directories(amdis_base INTERFACE ${AMDIS_INCLUDE_DIR}/extensions/pugixml)
target_include_directories(amdis_base INTERFACE ${AMDIS_INCLUDE_DIR}/extensions/time)
target_link_libraries(amdis_base INTERFACE ${_EXTENSIONS_LIB})
if (AMDIS_NEED_BASE_PROBLEMS)
target_include_directories(amdis_base INTERFACE ${AMDIS_INCLUDE_DIR}/extensions/base_problems)
...
...
AMDiS/cmake3/amdis_extensions.cmake
View file @
42deb9ac
...
...
@@ -9,7 +9,7 @@ if (ENABLE_EXTENSIONS)
if
(
NOT EXISTS
${
EXTENSIONS_DIR
}
/Helpers.h OR NOT EXISTS
${
EXTENSIONS_DIR
}
/ExtendedProblemStat.h
)
message
(
FATAL_ERROR
"Wrong extensions directory! Directory must contain the files 'Helpers.h' and 'ExtendedProblemStat.h'"
)
endif
()
add_library
(
amdis_extensions
${
EXTENSIONS_DIR
}
/Helpers.cc
${
EXTENSIONS_DIR
}
/BackgroundMesh.cc
...
...
@@ -20,7 +20,7 @@ if (ENABLE_EXTENSIONS)
${
EXTENSIONS_DIR
}
/pugixml/src/pugixml.cpp
)
add_library
(
AMDiS::extensions ALIAS amdis_extensions
)
target_compile_definitions
(
amdis_extensions PRIVATE HAVE_EXTENSIONS=1
)
target_include_directories
(
amdis_extensions PRIVATE
${
EXTENSIONS_DIR
}
...
...
@@ -28,8 +28,8 @@ if (ENABLE_EXTENSIONS)
${
EXTENSIONS_DIR
}
/nanoflann
${
EXTENSIONS_DIR
}
/pugixml/src
)
set
(
INSTALL_SUBDIRS . time preconditioner nanflann
)
set
(
INSTALL_SUBDIRS . time preconditioner nan
o
flann
)
if
(
ENABLE_SEQ_PETSC
)
target_sources
(
amdis_extensions PRIVATE
...
...
@@ -44,7 +44,7 @@ if (ENABLE_EXTENSIONS)
${
EXTENSIONS_DIR
}
/preconditioner/PetscSolverPfc_diag.cc
)
target_link_libraries
(
amdis_extensions amdis_parallel
)
endif
(
ENABLE_PARALLEL_DOMAIN
)
if
(
ENABLE_BASE_PROBLEMS
)
if
(
ENABLE_REINIT
)
target_sources
(
amdis_extensions PRIVATE
...
...
@@ -74,13 +74,13 @@ if (ENABLE_EXTENSIONS)
# ${EXTENSIONS_DIR}/base_problems/NavierStokes_Chorin.cc
# ${EXTENSIONS_DIR}/base_problems/NavierStokesPhase_Chorin.cc
# ${EXTENSIONS_DIR}/base_problems/VacancyPhaseFieldCrystal.cc
target_compile_definitions
(
amdis_extensions PRIVATE HAVE_BASE_PROBLEMS=1
)
target_include_directories
(
amdis_extensions PRIVATE
${
EXTENSIONS_DIR
}
/base_problems
)
list
(
APPEND INSTALL_SUBDIRS base_problems
)
endif
(
ENABLE_BASE_PROBLEMS
)
target_link_libraries
(
amdis_extensions amdis amdis_reinit
)
# specify how to install this target:
...
...
AMDiS/cmake3/find_boost.cmake
View file @
42deb9ac
if
(
BOOST_ROOT
)
file
(
TO_
NATIV
E_PATH
${
BOOST_ROOT
}
BOOST_ROOT
)
file
(
TO_
CMAK
E_PATH
${
BOOST_ROOT
}
BOOST_ROOT
)
endif
(
BOOST_ROOT
)
if
(
BOOST_LIBRARYDIR
)
file
(
TO_
NATIV
E_PATH
${
BOOST_LIBRARYDIR
}
BOOST_LIBRARYDIR
)
file
(
TO_
CMAK
E_PATH
${
BOOST_LIBRARYDIR
}
BOOST_LIBRARYDIR
)
endif
(
BOOST_LIBRARYDIR
)
set
(
BOOST_VERSION
"1.48"
)
...
...
AMDiS/cmake3/find_petsc.cmake
View file @
42deb9ac
...
...
@@ -43,7 +43,7 @@ function (petsc_get_version)
endfunction
()
if
(
PETSC_DIR
)
file
(
TO_
NATIV
E_PATH
${
PETSC_DIR
}
PETSC_DIR
)
file
(
TO_
CMAK
E_PATH
${
PETSC_DIR
}
PETSC_DIR
)
endif
(
PETSC_DIR
)
find_path
(
PETSC_DIR include/petsc.h
...
...
AMDiS/cmake3/find_umfpack.cmake
View file @
42deb9ac
...
...
@@ -4,7 +4,7 @@ if (ENABLE_UMFPACK OR AMDIS_NEED_UMFPACK)
endif
(
WIN32
)
if
(
SuiteSparse_DIR
)
file
(
TO_
NATIV
E_PATH
${
SuiteSparse_DIR
}
SuiteSparse_DIR
)
file
(
TO_
CMAK
E_PATH
${
SuiteSparse_DIR
}
SuiteSparse_DIR
)
endif
(
SuiteSparse_DIR
)
# try to use a cmake-package of suitesparse
...
...
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