mirror/CMake
1
0
Fork 0
mirror of https://github.com/Kitware/CMake.git synced 2026-01-01 19:30:13 -06:00
Code Issues Packages Projects Releases Wiki Activity

FetchContent: Don't discard non-empty SOURCE_DIR and BINARY_DIR

Browse Source
This commit is contained in:
Craig Scott
2022-05-18 23:28:10 +10:00
parent 8ce9bb8a0c
commit 8a28368feb
1 changed files with 9 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
Modules/FetchContent.cmake
View File

@@ -1165,10 +1165,18 @@ function(__FetchContent_setPopulated contentName)
set(propertyName "${prefix}_sourceDir")
define_property(GLOBAL PROPERTY ${propertyName})
if("${arg_SOURCE_DIR}" STREQUAL "")
# Don't discard a previously provided SOURCE_DIR
get_property(arg_SOURCE_DIR GLOBAL PROPERTY ${propertyName})
endif()
set_property(GLOBAL PROPERTY ${propertyName} "${arg_SOURCE_DIR}")
set(propertyName "${prefix}_binaryDir")
define_property(GLOBAL PROPERTY ${propertyName})
if("${arg_BINARY_DIR}" STREQUAL "")
# Don't discard a previously provided BINARY_DIR
get_property(arg_BINARY_DIR GLOBAL PROPERTY ${propertyName})
endif()
set_property(GLOBAL PROPERTY ${propertyName} "${arg_BINARY_DIR}")
set(propertyName "${prefix}_populated")
@@ -1690,10 +1698,8 @@ macro(FetchContent_MakeAvailable)
unset(__cmake_fpArgs)
if(${__cmake_contentName}_FOUND)
set(${__cmake_contentNameLower}_SOURCE_DIR "")
set(${__cmake_contentNameLower}_BINARY_DIR "")
set(${__cmake_contentNameLower}_POPULATED TRUE)
__FetchContent_setPopulated(${__cmake_contentName})
FetchContent_GetProperties(${__cmake_contentName})
continue()
endif()
endif()