From 16424aff91e8ba1286e7aee23306d1b57a3d7762 Mon Sep 17 00:00:00 2001
From: Nat! <nat@mulle-kybernetik.com>
Date: Wed, 11 Dec 2024 17:54:00 +0100
Subject: [PATCH] updated build system files and versions

---
 .mulle/share/env/environment-plugin.sh              |  2 +-
 .mulle/share/env/version                            |  2 +-
 .mulle/share/sde/version/mulle-sde/cmake            |  2 +-
 cmake/share/InstallRpath.cmake                      | 13 +++++++++----
 test/.mulle/share/env/environment-plugin.sh         |  2 +-
 test/.mulle/share/env/version                       |  2 +-
 .../share/sde/version/mulle-sde/base-test-runtime   |  2 +-
 test/.mulle/share/sde/version/mulle-sde/c-test      |  2 +-
 .../share/sde/version/mulle-sde/c-test-runtime      |  2 +-
 9 files changed, 17 insertions(+), 12 deletions(-)

diff --git a/.mulle/share/env/environment-plugin.sh b/.mulle/share/env/environment-plugin.sh
index e35d3a2..33b0fbb 100644
--- a/.mulle/share/env/environment-plugin.sh
+++ b/.mulle/share/env/environment-plugin.sh
@@ -22,6 +22,6 @@ export MULLE_SOURCETREE_SYMLINK='YES'
 #
 #
 #
-export MULLE_SDE_INSTALLED_VERSION="3.2.0"
+export MULLE_SDE_INSTALLED_VERSION="3.2.2"
 
 
diff --git a/.mulle/share/env/version b/.mulle/share/env/version
index 03f488b..c7cb131 100644
--- a/.mulle/share/env/version
+++ b/.mulle/share/env/version
@@ -1 +1 @@
-5.3.0
+5.3.1
diff --git a/.mulle/share/sde/version/mulle-sde/cmake b/.mulle/share/sde/version/mulle-sde/cmake
index 697f087..48f7a71 100644
--- a/.mulle/share/sde/version/mulle-sde/cmake
+++ b/.mulle/share/sde/version/mulle-sde/cmake
@@ -1 +1 @@
-0.28.0
+0.28.1
diff --git a/cmake/share/InstallRpath.cmake b/cmake/share/InstallRpath.cmake
index dbdae7f..8e03fcb 100644
--- a/cmake/share/InstallRpath.cmake
+++ b/cmake/share/InstallRpath.cmake
@@ -27,10 +27,15 @@ if( MULLE_NO_CMAKE_INSTALL_RPATH)
    set( CMAKE_SKIP_BUILD_RPATH ON)
 else()
    if( APPLE)
-      set( CMAKE_INSTALL_RPATH
-         "@loader_path/../lib/"
-         "@loader_path/../Frameworks/"
-      )
+      if( CMAKE_VERSION VERSION_GREATER_EQUAL 3.20)
+         # Modern CMake handles lib path automatically
+         set(CMAKE_INSTALL_RPATH "@loader_path/../Frameworks/")
+      else()
+         set(CMAKE_INSTALL_RPATH
+            "@loader_path/../lib/"
+            "@loader_path/../Frameworks/"
+         )
+      endif()
    else()
       set( CMAKE_INSTALL_RPATH "\$ORIGIN/../lib")
    endif()
diff --git a/test/.mulle/share/env/environment-plugin.sh b/test/.mulle/share/env/environment-plugin.sh
index e35d3a2..33b0fbb 100644
--- a/test/.mulle/share/env/environment-plugin.sh
+++ b/test/.mulle/share/env/environment-plugin.sh
@@ -22,6 +22,6 @@ export MULLE_SOURCETREE_SYMLINK='YES'
 #
 #
 #
-export MULLE_SDE_INSTALLED_VERSION="3.2.0"
+export MULLE_SDE_INSTALLED_VERSION="3.2.2"
 
 
diff --git a/test/.mulle/share/env/version b/test/.mulle/share/env/version
index 03f488b..c7cb131 100644
--- a/test/.mulle/share/env/version
+++ b/test/.mulle/share/env/version
@@ -1 +1 @@
-5.3.0
+5.3.1
diff --git a/test/.mulle/share/sde/version/mulle-sde/base-test-runtime b/test/.mulle/share/sde/version/mulle-sde/base-test-runtime
index 19b860c..a4c853e 100644
--- a/test/.mulle/share/sde/version/mulle-sde/base-test-runtime
+++ b/test/.mulle/share/sde/version/mulle-sde/base-test-runtime
@@ -1 +1 @@
-6.4.0
+6.4.2
diff --git a/test/.mulle/share/sde/version/mulle-sde/c-test b/test/.mulle/share/sde/version/mulle-sde/c-test
index 19b860c..a4c853e 100644
--- a/test/.mulle/share/sde/version/mulle-sde/c-test
+++ b/test/.mulle/share/sde/version/mulle-sde/c-test
@@ -1 +1 @@
-6.4.0
+6.4.2
diff --git a/test/.mulle/share/sde/version/mulle-sde/c-test-runtime b/test/.mulle/share/sde/version/mulle-sde/c-test-runtime
index 19b860c..a4c853e 100644
--- a/test/.mulle/share/sde/version/mulle-sde/c-test-runtime
+++ b/test/.mulle/share/sde/version/mulle-sde/c-test-runtime
@@ -1 +1 @@
-6.4.0
+6.4.2