Skip to content
Snippets Groups Projects
Commit 5b575bcf authored by Stéphane Del Pino's avatar Stéphane Del Pino
Browse files

Merge branch 'develop' into feature/reconstruction

parents effbab6b cbaa3050
Branches
No related tags found
1 merge request!205High-order polynomial reconstruction
...@@ -178,6 +178,7 @@ if (PUGS_ENABLE_PETSC MATCHES "^(AUTO|ON)$") ...@@ -178,6 +178,7 @@ if (PUGS_ENABLE_PETSC MATCHES "^(AUTO|ON)$")
# PETSc support is deactivated if MPI is not found # PETSc support is deactivated if MPI is not found
pkg_check_modules(PETSC IMPORTED_TARGET GLOBAL PETSc) pkg_check_modules(PETSC IMPORTED_TARGET GLOBAL PETSc)
if (${PETSC_FOUND})
set_property(TARGET PkgConfig::PETSC PROPERTY set_property(TARGET PkgConfig::PETSC PROPERTY
IMPORTED_LOCATION "${PETSC_LIBRARIES}" IMPORTED_LOCATION "${PETSC_LIBRARIES}"
) )
...@@ -186,6 +187,7 @@ if (PUGS_ENABLE_PETSC MATCHES "^(AUTO|ON)$") ...@@ -186,6 +187,7 @@ if (PUGS_ENABLE_PETSC MATCHES "^(AUTO|ON)$")
) )
set(PETSC_TARGET PkgConfig::PETSC) set(PETSC_TARGET PkgConfig::PETSC)
endif()
else() else()
message(STATUS "PETSc support is deactivated since pugs will not be build with MPI support") message(STATUS "PETSc support is deactivated since pugs will not be build with MPI support")
set(PETSC_FOUND FALSE) set(PETSC_FOUND FALSE)
...@@ -215,6 +217,7 @@ if (PUGS_ENABLE_SLEPC MATCHES "^(AUTO|ON)$") ...@@ -215,6 +217,7 @@ if (PUGS_ENABLE_SLEPC MATCHES "^(AUTO|ON)$")
# SLEPc support is deactivated if PETSc is not found # SLEPc support is deactivated if PETSc is not found
pkg_check_modules(SLEPC IMPORTED_TARGET GLOBAL SLEPc) pkg_check_modules(SLEPC IMPORTED_TARGET GLOBAL SLEPc)
if (${SLEPC_FOUND})
set_property(TARGET PkgConfig::SLEPC PROPERTY set_property(TARGET PkgConfig::SLEPC PROPERTY
IMPORTED_LOCATION "${SLEPC_LIBRARIES}" IMPORTED_LOCATION "${SLEPC_LIBRARIES}"
) )
...@@ -223,6 +226,7 @@ if (PUGS_ENABLE_SLEPC MATCHES "^(AUTO|ON)$") ...@@ -223,6 +226,7 @@ if (PUGS_ENABLE_SLEPC MATCHES "^(AUTO|ON)$")
) )
set(SLEPC_TARGET PkgConfig::SLEPC) set(SLEPC_TARGET PkgConfig::SLEPC)
endif()
else() else()
message(STATUS "SLEPc support is deactivated since pugs will not be build with PETSc support") message(STATUS "SLEPc support is deactivated since pugs will not be build with PETSc support")
set(SLEPC_FOUND FALSE) set(SLEPC_FOUND FALSE)
...@@ -289,7 +293,7 @@ if (PUGS_ENABLE_HDF5 MATCHES "^(AUTO|ON)$") ...@@ -289,7 +293,7 @@ if (PUGS_ENABLE_HDF5 MATCHES "^(AUTO|ON)$")
set(PUGS_HAS_HDF5 ${HDF5_FOUND}) set(PUGS_HAS_HDF5 ${HDF5_FOUND})
else() else()
unset(HIGHFIVE_TARGET) unset(HIGHFIVE_TARGET)
unset(HDF5_TARGET PkgConfig::HDF5) unset(HDF5_TARGET)
unset(PUGS_HAS_HDF5) unset(PUGS_HAS_HDF5)
endif() endif()
......
...@@ -11,9 +11,9 @@ Building this plugin requires an **installed** version of `pugs`. ...@@ -11,9 +11,9 @@ Building this plugin requires an **installed** version of `pugs`.
Before building `pugs` one should define its installation directory. Before building `pugs` one should define its installation directory.
In the `pugs` compilation directory one should execute In the `pugs` compilation directory one should execute
```shell ```shell
cmake -DCMAKE_INSTALL_PREFIX=pugs_install_dir ... cmake -DCMAKE_INSTALL_PREFIX=[pugs_install_dir] [pugs_src_path] [...]
``` ```
where `pugs_install_dir` is the chosen installation directory. where `[pugs_install_dir]` is the chosen installation directory.
Then one simply runs Then one simply runs
```shell ```shell
...@@ -30,12 +30,12 @@ make install ...@@ -30,12 +30,12 @@ make install
> is not able to remove them, to avoid the risk of compilation issues, > is not able to remove them, to avoid the risk of compilation issues,
> one has to dot it manually... > one has to dot it manually...
In the build directory one runs In the plugin build directory one runs
```shell ```shell
cmake -DPUGS_PREFIX_PATH=pugs_install_dir _PLUGIN_LOW__dir cmake -DPUGS_PREFIX_PATH=[pugs_install_dir] [_PLUGIN_LOW__src_dir]
``` ```
where `pugs_install_dir` has the same value as above and `_PLUGIN_LOW__dir` where `[pugs_install_dir]` has the same value as above and `[_PLUGIN_LOW__src_dir]`
is the directory that contains this `README.md` file. is the plugin source directory that contains this `README.md` file.
Then to build the plugin, one runs Then to build the plugin, one runs
```shell ```shell
...@@ -65,3 +65,6 @@ export PUGS_PLUGIN_DIR="/pathtoplugin1;/pathtoplugin2" ...@@ -65,3 +65,6 @@ export PUGS_PLUGIN_DIR="/pathtoplugin1;/pathtoplugin2"
``` ```
Then one launches `pugs` classically. Then one launches `pugs` classically.
```shell
[pugs_install_dir]/bin/pugs [script.pgs]
```
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment