Skip to content

Commit

Permalink
Remove EP_SOURCE_DIR_PERSISTENT property
Browse files Browse the repository at this point in the history
It's actually useless, since the folder being removed is a bug, and
also, apparently, this behaviour happens only with git.
  • Loading branch information
drdanz committed Feb 14, 2019
1 parent 39f9f90 commit 75e8943
Showing 1 changed file with 1 addition and 8 deletions.
9 changes: 1 addition & 8 deletions cmake-next/proposed/ExternalProject.cmake
Original file line number Diff line number Diff line change
Expand Up @@ -1041,13 +1041,6 @@ define_property(DIRECTORY PROPERTY "EP_UPDATE_DISCONNECTED" INHERITED
"ExternalProject module."
)

define_property(DIRECTORY PROPERTY "EP_SOURCE_DIR_PERSISTENT" INHERITED
BRIEF_DOCS "Whether source dir stored outside the build directory should be preserved."
FULL_DOCS
"See documentation of the ExternalProject_Add() function in the "
"ExternalProject module."
)

function(_ep_write_gitclone_script script_filename source_dir git_EXECUTABLE git_repository git_tag git_remote_name git_submodules git_shallow git_progress git_config src_name work_dir gitclone_infofile gitclone_stampfile tls_verify)
if(NOT GIT_VERSION_STRING VERSION_LESS 1.7.10)
set(git_clone_shallow_options "--depth 1 --no-single-branch")
Expand Down Expand Up @@ -1105,7 +1098,7 @@ foreach(config IN LISTS git_config)
list(APPEND git_clone_options --config \${config})
endforeach()
if(EXISTS \"${source_dir}\" AND ${source_dir_persistent})
if(EXISTS \"${source_dir}\")
if(NOT IS_DIRECTORY \"${source_dir}\")
# FIXME Perhaps support symbolic links?
message(FATAL_ERROR \"\\\"${source_dir}\\\" exists and is not a git repository. Remove it and try again\")
Expand Down

0 comments on commit 75e8943

Please sign in to comment.