Skip to content

Commit

Permalink
Merge branch 'topic/timw/fetchcontent_mkdir'
Browse files Browse the repository at this point in the history
* topic/timw/fetchcontent_mkdir:
  Pass source directory to FetchContent_Populate for older CMakes
  Workaround for configure failures with FETCHCONTENT_FULLY_DISCONNECTED
  • Loading branch information
timwoj committed Jul 12, 2024
2 parents 690483f + 8a41172 commit 2d42baf
Showing 1 changed file with 2 additions and 1 deletion.
3 changes: 2 additions & 1 deletion ZeekBundle.cmake
Original file line number Diff line number Diff line change
Expand Up @@ -123,7 +123,8 @@ 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}"
${arg_CONFIGURE})
Expand Down

0 comments on commit 2d42baf

Please sign in to comment.