diff --git a/CMakeLists.txt b/CMakeLists.txt index 7f2d901..b6c0136 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -8,7 +8,7 @@ set(JAMBA_MACOS_DEPLOYMENT_TARGET "10.14" CACHE STRING "macOS deployment target" # To use local jamba install, uncomment the following line (no download) set(JAMBA_ROOT_DIR "") -set(JAMBA_ROOT_DIR "${CMAKE_CURRENT_LIST_DIR}/../../pongasoft/jamba") +#set(JAMBA_ROOT_DIR "${CMAKE_CURRENT_LIST_DIR}/../../pongasoft/jamba") # download jamba framework include(fetch_jamba.cmake) @@ -18,7 +18,7 @@ include("${JAMBA_ROOT_DIR}/cmake/JambaSetArchitecture.cmake") set(PLUGIN_MAJOR_VERSION 2) set(PLUGIN_MINOR_VERSION 1) -set(PLUGIN_PATCH_VERSION 0) +set(PLUGIN_PATCH_VERSION 1) set(PLUGIN_VERSION "${PLUGIN_MAJOR_VERSION}.${PLUGIN_MINOR_VERSION}.${PLUGIN_PATCH_VERSION}") project("jamba-sample-gain" VERSION "${PLUGIN_VERSION}") diff --git a/README.md b/README.md index 98d042e..278821b 100644 --- a/README.md +++ b/README.md @@ -198,6 +198,9 @@ For windows, follow the same steps for macOS with the following changes: Release Notes ------------- +### 2024-12-02 - `v2.1.1` +* use latest version of Jamba (v7.1.3) + ### 2024-11-29 - `v2.1.0` * use latest version of Jamba (v7.1.2) diff --git a/fetch_jamba.cmake b/fetch_jamba.cmake index 26f7ece..6c8db5c 100644 --- a/fetch_jamba.cmake +++ b/fetch_jamba.cmake @@ -3,40 +3,39 @@ cmake_minimum_required(VERSION 3.19) include(FetchContent) set(JAMBA_GIT_REPO "https://github.com/pongasoft/jamba" CACHE STRING "Jamba git repository url") -set(JAMBA_GIT_TAG v7.1.2 CACHE STRING "Jamba git tag") -set(JAMBA_DOWNLOAD_URL "${JAMBA_GIT_REPO}/archive/refs/tags/v7.1.2.zip" CACHE STRING "Jamba download url") -set(JAMBA_DOWNLOAD_URL_HASH "SHA256=ad297edbfd6aaadea8a1762d58fff622c6e7275a3881c2d89e7b0e451ed757b2" CACHE STRING "Jamba download url hash") +set(JAMBA_GIT_TAG v7.1.3 CACHE STRING "Jamba git tag") +set(JAMBA_DOWNLOAD_URL "${JAMBA_GIT_REPO}/archive/refs/tags/v7.1.3.zip" CACHE STRING "Jamba download url") +set(JAMBA_DOWNLOAD_URL_HASH "SHA256=c177c031afebf97e3c8ccaf70e9de09a1cfbe4d4503e45106612cceef03f3fe0" CACHE STRING "Jamba download url hash") if(JAMBA_ROOT_DIR) message(STATUS "Using jamba from local ${JAMBA_ROOT_DIR}") - FetchContent_Populate(jamba - QUIET - SOURCE_DIR "${JAMBA_ROOT_DIR}" - BINARY_DIR "${CMAKE_BINARY_DIR}/jamba-build" + FetchContent_Declare(jamba + SOURCE_DIR "${JAMBA_ROOT_DIR}" + SOURCE_SUBDIR "do_not_make_available" # invalid folder to not execute jamba/CMakeLists.txt ) else() if(JAMBA_DOWNLOAD_URL STREQUAL "" OR JAMBA_DOWNLOAD_URL_HASH STREQUAL "") message(STATUS "Fetching jamba from ${JAMBA_GIT_REPO}/tree/${JAMBA_GIT_TAG}") - FetchContent_Populate(jamba - QUIET + FetchContent_Declare(jamba GIT_REPOSITORY ${JAMBA_GIT_REPO} GIT_TAG ${JAMBA_GIT_TAG} GIT_CONFIG advice.detachedHead=false GIT_SHALLOW true SOURCE_DIR "${CMAKE_BINARY_DIR}/jamba" - BINARY_DIR "${CMAKE_BINARY_DIR}/jamba-build" + SOURCE_SUBDIR "do_not_make_available" ) else() message(STATUS "Fetching jamba from ${JAMBA_DOWNLOAD_URL}") - FetchContent_Populate(jamba - QUIET + FetchContent_Declare(jamba URL "${JAMBA_DOWNLOAD_URL}" URL_HASH "${JAMBA_DOWNLOAD_URL_HASH}" DOWNLOAD_EXTRACT_TIMESTAMP true SOURCE_DIR "${CMAKE_BINARY_DIR}/jamba" - BINARY_DIR "${CMAKE_BINARY_DIR}/jamba-build" + SOURCE_SUBDIR "do_not_make_available" ) endif() endif() +FetchContent_MakeAvailable(jamba) + set(JAMBA_ROOT_DIR ${jamba_SOURCE_DIR}) \ No newline at end of file