From baf5440cb768b813112b536b28db43a00f735fd9 Mon Sep 17 00:00:00 2001 From: Nat! Date: Wed, 11 Dec 2024 17:23:10 +0100 Subject: [PATCH] versioncheck commit --- .mulle/share/env/environment-plugin.sh | 2 +- .mulle/share/env/version | 2 +- .mulle/share/sde/version/mulle-sde/cmake | 2 +- CMakeLists.txt | 2 +- RELEASENOTES.md | 4 ++++ clib.json | 2 +- cmake/share/InstallRpath.cmake | 13 +++++++++---- src/mulle-mmap.h | 2 +- src/reflect/_mulle-mmap-versioncheck.h | 2 +- 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 +- 14 files changed, 25 insertions(+), 16 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/CMakeLists.txt b/CMakeLists.txt index ca8308d..22126e2 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -1,6 +1,6 @@ cmake_minimum_required( VERSION 3.14) -project( mulle-mmap VERSION 0.2.3 LANGUAGES C) +project( mulle-mmap VERSION 0.2.4 LANGUAGES C) diff --git a/RELEASENOTES.md b/RELEASENOTES.md index 559ffdf..885f8fe 100644 --- a/RELEASENOTES.md +++ b/RELEASENOTES.md @@ -1,3 +1,7 @@ +### 0.2.4 + +Various small improvements + ### 0.2.3 Various small improvements diff --git a/clib.json b/clib.json index cdf74c9..7aa592f 100644 --- a/clib.json +++ b/clib.json @@ -1,6 +1,6 @@ { "name" : "mulle-mmap", - "version" : "0.2.3", + "version" : "0.2.4", "description" : "🇧🇿 Memory mapped file access", "keywords" : [], "license" : "BSD-3-Clause", 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/src/mulle-mmap.h b/src/mulle-mmap.h index c6cd8a2..c5e689c 100644 --- a/src/mulle-mmap.h +++ b/src/mulle-mmap.h @@ -32,7 +32,7 @@ #include -#define MULLE__MMAP_VERSION ((0UL << 20) | (2 << 8) | 3) +#define MULLE__MMAP_VERSION ((0UL << 20) | (2 << 8) | 4) static inline unsigned int mulle_mmap_get_version_major( void) diff --git a/src/reflect/_mulle-mmap-versioncheck.h b/src/reflect/_mulle-mmap-versioncheck.h index 2afa536..83424dc 100644 --- a/src/reflect/_mulle-mmap-versioncheck.h +++ b/src/reflect/_mulle-mmap-versioncheck.h @@ -7,7 +7,7 @@ #if defined( MULLE__C11_VERSION) # ifndef MULLE__C11_VERSION_MIN -# define MULLE__C11_VERSION_MIN ((4UL << 20) | (5 << 8) | 0) +# define MULLE__C11_VERSION_MIN ((4UL << 20) | (6 << 8) | 0) # endif # ifndef MULLE__C11_VERSION_MAX # define MULLE__C11_VERSION_MAX ((5UL << 20) | (0 << 8) | 0) 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