From ec934c1b56df7c5f93cab3859889ebe0410f3059 Mon Sep 17 00:00:00 2001 From: Tim Wojtulewicz Date: Fri, 12 Jul 2024 11:58:59 -0700 Subject: [PATCH 1/2] Workaround for configure failures with FETCHCONTENT_FULLY_DISCONNECTED --- ZeekBundle.cmake | 1 + 1 file changed, 1 insertion(+) diff --git a/ZeekBundle.cmake b/ZeekBundle.cmake index 234a060..1f534af 100644 --- a/ZeekBundle.cmake +++ b/ZeekBundle.cmake @@ -124,6 +124,7 @@ function (ZeekBundle_Add) FetchContent_Declare(dl_${arg_NAME} ${arg_FETCH}) string(TOLOWER "dl_${arg_NAME}" internalName) FetchContent_Populate(${internalName}) + file(MAKE_DIRECTORY "${${internalName}_BINARY_DIR}") # Build the package and verify that it was found. zeekbundle_build(${arg_NAME} "${${internalName}_SOURCE_DIR}" "${${internalName}_BINARY_DIR}" ${arg_CONFIGURE}) From 8a411726c733670715b7218c0aa240f440059fec Mon Sep 17 00:00:00 2001 From: Tim Wojtulewicz Date: Fri, 12 Jul 2024 13:40:22 -0700 Subject: [PATCH 2/2] Pass source directory to FetchContent_Populate for older CMakes --- ZeekBundle.cmake | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ZeekBundle.cmake b/ZeekBundle.cmake index 1f534af..d4fec42 100644 --- a/ZeekBundle.cmake +++ b/ZeekBundle.cmake @@ -123,7 +123,7 @@ function (ZeekBundle_Add) # Fetch the package by delegating to FetchContent. FetchContent_Declare(dl_${arg_NAME} ${arg_FETCH}) string(TOLOWER "dl_${arg_NAME}" internalName) - FetchContent_Populate(${internalName}) + FetchContent_Populate(${internalName} SOURCE_DIR ${arg_FETCH}) file(MAKE_DIRECTORY "${${internalName}_BINARY_DIR}") # Build the package and verify that it was found. zeekbundle_build(${arg_NAME} "${${internalName}_SOURCE_DIR}" "${${internalName}_BINARY_DIR}"