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/README.md b/README.md index 78cbd1c..5bc5bc3 100644 --- a/README.md +++ b/README.md @@ -9,7 +9,7 @@ function for executables, that link against | Release Version | Release Notes |-------------------------------------------------------|-------------- -| ![Mulle kybernetiK tag](https://img.shields.io/github/tag/MulleFoundation/Foundation-startup.svg?branch=release) [![Build Status](https://github.com/MulleFoundation/Foundation-startup/workflows/CI/badge.svg?branch=release)](//github.com/MulleFoundation/Foundation-startup/actions) | [RELEASENOTES](RELEASENOTES.md) | +| ![Mulle kybernetiK tag](https://img.shields.io/github/tag/MulleFoundation/Foundation-startup.svg) [![Build Status](https://github.com/MulleFoundation/Foundation-startup/workflows/CI/badge.svg)](//github.com/MulleFoundation/Foundation-startup/actions) | [RELEASENOTES](RELEASENOTES.md) | 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()