From e0956cb6800f1f1c8d8f22bb315f29780799c296 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Erik=20Fr=C3=B6jdh?= Date: Fri, 13 Nov 2026 17:12:20 +0100 Subject: [PATCH] removed libexpat from dependency list (#1680) Co-authored-by: Dhanya Thattil --- README.md | 13 +++---------- conda-recipes/main-library/meta.yaml | 1 - docs/src/installation.rst | 14 +++----------- slsDetectorGui/CMakeLists.txt | 1 - 4 files changed, 6 insertions(+), 23 deletions(-) diff --git a/README.md b/README.md index 3727bb07f..d8d26f2d4 100644 --- a/README.md +++ b/README.md @@ -265,20 +265,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 diff --git a/conda-recipes/main-library/meta.yaml b/conda-recipes/main-library/meta.yaml index 1c495645d..adc7c177e 100755 --- a/conda-recipes/main-library/meta.yaml +++ b/conda-recipes/main-library/meta.yaml @@ -28,7 +28,6 @@ requirements: - libgl-devel # [linux] - libtiff - zlib - - expat - zeromq - fmt diff --git a/docs/src/installation.rst b/docs/src/installation.rst index 43506b25d..0dfb85a36 100644 --- a/docs/src/installation.rst +++ b/docs/src/installation.rst @@ -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 diff --git a/slsDetectorGui/CMakeLists.txt b/slsDetectorGui/CMakeLists.txt index 985546180..48190b12f 100755 --- a/slsDetectorGui/CMakeLists.txt +++ b/slsDetectorGui/CMakeLists.txt @@ -102,7 +102,6 @@ target_link_libraries(slsDetectorGui PUBLIC Qt5::Widgets Qt5::Gui Qt5::Core - expat PRIVATE slsProjectWarnings