@@ -3,41 +3,40 @@ cmake_minimum_required(VERSION 3.19)
3
3
include (FetchContent )
4
4
5
5
set (JAMBA_GIT_REPO "https://github.com/pongasoft/jamba" CACHE STRING "Jamba git repository url" )
6
- set (JAMBA_GIT_TAG v7.1.2 CACHE STRING "Jamba git tag" )
7
- set (JAMBA_DOWNLOAD_URL "${JAMBA_GIT_REPO} /archive/refs/tags/v7.1.2 .zip" CACHE STRING "Jamba download url" )
8
- set (JAMBA_DOWNLOAD_URL_HASH "SHA256=ad297edbfd6aaadea8a1762d58fff622c6e7275a3881c2d89e7b0e451ed757b2 " CACHE STRING "Jamba download url hash" )
6
+ set (JAMBA_GIT_TAG v7.1.3 CACHE STRING "Jamba git tag" )
7
+ set (JAMBA_DOWNLOAD_URL "${JAMBA_GIT_REPO} /archive/refs/tags/v7.1.3 .zip" CACHE STRING "Jamba download url" )
8
+ set (JAMBA_DOWNLOAD_URL_HASH "SHA256=c177c031afebf97e3c8ccaf70e9de09a1cfbe4d4503e45106612cceef03f3fe0 " CACHE STRING "Jamba download url hash" )
9
9
10
10
if (JAMBA_ROOT_DIR )
11
11
message (STATUS "Using jamba from local ${JAMBA_ROOT_DIR} " )
12
- FetchContent_Populate (jamba
13
- QUIET
14
- SOURCE_DIR "${JAMBA_ROOT_DIR} "
15
- BINARY_DIR "${CMAKE_BINARY_DIR} /jamba-build"
12
+ FetchContent_Declare (jamba
13
+ SOURCE_DIR "${JAMBA_ROOT_DIR} "
14
+ SOURCE_SUBDIR "do_not_make_available" # invalid folder to not execute jamba/CMakeLists.txt
16
15
)
17
16
else ()
18
17
if (JAMBA_DOWNLOAD_URL STREQUAL "" OR JAMBA_DOWNLOAD_URL_HASH STREQUAL "" )
19
18
message (STATUS "Fetching jamba from ${JAMBA_GIT_REPO} /tree/${JAMBA_GIT_TAG} " )
20
- FetchContent_Populate (jamba
21
- QUIET
19
+ FetchContent_Declare (jamba
22
20
GIT_REPOSITORY ${JAMBA_GIT_REPO}
23
21
GIT_TAG ${JAMBA_GIT_TAG}
24
22
GIT_CONFIG advice.detachedHead=false
25
23
GIT_SHALLOW true
26
24
SOURCE_DIR "${CMAKE_BINARY_DIR} /jamba"
27
- BINARY_DIR " ${CMAKE_BINARY_DIR} /jamba-build "
25
+ SOURCE_SUBDIR "do_not_make_available "
28
26
)
29
27
else ()
30
28
message (STATUS "Fetching jamba from ${JAMBA_DOWNLOAD_URL} " )
31
- FetchContent_Populate (jamba
32
- QUIET
29
+ FetchContent_Declare (jamba
33
30
URL "${JAMBA_DOWNLOAD_URL} "
34
31
URL_HASH "${JAMBA_DOWNLOAD_URL_HASH} "
35
32
DOWNLOAD_EXTRACT_TIMESTAMP true
36
33
SOURCE_DIR "${CMAKE_BINARY_DIR} /jamba"
37
- BINARY_DIR " ${CMAKE_BINARY_DIR} /jamba-build "
34
+ SOURCE_SUBDIR "do_not_make_available "
38
35
)
39
36
endif ()
40
37
endif ()
41
38
39
+ FetchContent_MakeAvailable (jamba )
40
+
42
41
set (JAMBA_ROOT_DIR ${jamba_SOURCE_DIR} )
43
42
0 commit comments