mirror of
https://github.com/slsdetectorgroup/slsDetectorPackage.git
synced 2026-11-18 17:24:04 +01:00
removed libexpat from dependency list (#1682)
Co-authored-by: Erik Frojdh <erik.frojdh@psi.ch>
This commit is contained in:
1 parent
916435cef8
commit
79b3b8c268
4 files changed
+6
-23
No files matched your search
@@ -264,20 +264,13 @@ conda create -n myenv slsdetgui=7.0.0
|
||||
conda activate myenv
|
||||
```
|
||||
|
||||
2. Using system installation on RHEL7
|
||||
2. Using system installation on RHEL7/RHEL8
|
||||
```
|
||||
yum install qt5-qtbase-devel.x86_64
|
||||
yum install qt5-qtsvg-devel.x86_64
|
||||
yum install qt5-qtsvg-devel.x86_64
|
||||
```
|
||||
|
||||
3. Using system installation on RHEL8
|
||||
```
|
||||
yum install qt5-qtbase-devel.x86_64
|
||||
yum install qt5-qtsvg-devel.x86_64
|
||||
yum install expat-devel.x86_64
|
||||
```
|
||||
|
||||
4. Using conda
|
||||
3. Using conda
|
||||
```
|
||||
#Add channels for dependencies and our library
|
||||
conda config --add channels conda-forge
|
||||
|
||||
@@ -28,7 +28,6 @@ requirements:
|
||||
- libgl-devel # [linux]
|
||||
- libtiff
|
||||
- zlib
|
||||
- expat
|
||||
- zeromq
|
||||
|
||||
run:
|
||||
|
||||
@@ -322,22 +322,14 @@ using this compiler
|
||||
conda activate myenv
|
||||
|
||||
|
||||
2. Using system installation on RHEL7
|
||||
2. Using system installation on RHEL7/RHEL8
|
||||
|
||||
.. code-block:: bash
|
||||
|
||||
yum install qt5-qtbase-devel.x86_64
|
||||
yum install qt5-qtsvg-devel.x86_64
|
||||
yum install qt5-qtsvg-devel.x86_64
|
||||
|
||||
3. Using system installation on RHEL8
|
||||
|
||||
.. code-block:: bash
|
||||
|
||||
yum install qt5-qtbase-devel.x86_64
|
||||
yum install qt5-qtsvg-devel.x86_64
|
||||
yum install expat-devel.x86_64
|
||||
|
||||
4. Using conda
|
||||
3. Using conda
|
||||
|
||||
.. code-block:: bash
|
||||
|
||||
|
||||
@@ -102,7 +102,6 @@ target_link_libraries(slsDetectorGui PUBLIC
|
||||
Qt5::Widgets
|
||||
Qt5::Gui
|
||||
Qt5::Core
|
||||
expat
|
||||
|
||||
PRIVATE
|
||||
slsProjectWarnings
|
||||
|
||||
Reference in new issue
Block a user