From 95de36c70595438202f55b68101ac70fa648f475 Mon Sep 17 00:00:00 2001
From: Awawa <69086569+awawa-dev@users.noreply.github.com>
Date: Fri, 28 Jul 2023 20:14:09 +0200
Subject: [PATCH] Add support for latest Fedora (#591)

---
 .github/workflows/push-master.yml            | 7 ++++++-
 .github/workflows/upload-to-github-pages.yml | 6 ++++++
 CMakeLists.txt                               | 2 +-
 3 files changed, 13 insertions(+), 2 deletions(-)

diff --git a/.github/workflows/push-master.yml b/.github/workflows/push-master.yml
index 18ebc428e..762a1ede6 100644
--- a/.github/workflows/push-master.yml
+++ b/.github/workflows/push-master.yml
@@ -43,7 +43,11 @@ jobs:
           - dockerImage: x86_64
             linuxVersion: ArchLinux
             dockerName: Arch Linux (x86_64)
-            platform: linux 
+            platform: linux
+          - dockerImage: x86_64
+            linuxVersion: Fedora_38
+            dockerName: Fedora 38 (x86_64)
+            platform: linux
     steps:
       # checkout
       - uses: actions/checkout@v3
@@ -96,6 +100,7 @@ jobs:
           path: |
             deploy/Hyper*.deb
             deploy/Hyper*.zst
+            deploy/Hyper*.rpm
 
 ######################
 ####### macOS ########
diff --git a/.github/workflows/upload-to-github-pages.yml b/.github/workflows/upload-to-github-pages.yml
index 2797c9f62..071d105fd 100644
--- a/.github/workflows/upload-to-github-pages.yml
+++ b/.github/workflows/upload-to-github-pages.yml
@@ -53,6 +53,12 @@ jobs:
             arch: amd64
             platform: linux
             niceName: Ubuntu 23.04
+          - dockerImage: x86_64
+            linuxVersion: Fedora_38
+            dockerName: Fedora 38 (x86_64)
+            arch: amd64
+            platform: linux
+            niceName: Fedora 38
 
     steps:
       # checkout
diff --git a/CMakeLists.txt b/CMakeLists.txt
index 83c7d03a3..217d9ec08 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -454,7 +454,7 @@ endif()
 if (UNIX AND NOT APPLE)
 	SET(CMAKE_SKIP_BUILD_RPATH FALSE)
 	SET(CMAKE_BUILD_WITH_INSTALL_RPATH TRUE)
-	SET(CMAKE_INSTALL_RPATH "${CMAKE_INSTALL_RPATH}:$ORIGIN/../lib")
+	list(APPEND CMAKE_INSTALL_RPATH "$ORIGIN/../lib")
 	SET(CMAKE_INSTALL_RPATH_USE_LINK_PATH TRUE)
 endif ()