Skip to content
GitLab
Explore
Sign in
Register
Primary navigation
Search or go to…
Project
CMake
Manage
Activity
Members
Labels
Plan
Issues
Issue boards
Milestones
Wiki
Code
Merge requests
Repository
Branches
Commits
Tags
Repository graph
Compare revisions
Snippets
Build
Pipelines
Jobs
Pipeline schedules
Artifacts
Deploy
Releases
Container Registry
Model registry
Operate
Environments
Monitor
Incidents
Service Desk
Analyze
Value stream analytics
Contributor analytics
CI/CD analytics
Repository analytics
Model experiments
Help
Help
Support
GitLab documentation
Compare GitLab plans
Community forum
Contribute to GitLab
Provide feedback
Keyboard shortcuts
?
Snippets
Groups
Projects
Show more breadcrumbs
Daniel Pfeifer
CMake
Commits
99d6de6c
Commit
99d6de6c
authored
8 years ago
by
Ben Boeckel
Browse files
Options
Downloads
Patches
Plain Diff
ExternalProject: only append `COMMAND` if actually adding a command
Fixes
#16544
.
parent
cdb6d7df
Loading
Loading
No related merge requests found
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
Modules/ExternalProject.cmake
+2
-3
2 additions, 3 deletions
Modules/ExternalProject.cmake
Tests/ExternalProject/CMakeLists.txt
+10
-0
10 additions, 0 deletions
Tests/ExternalProject/CMakeLists.txt
with
12 additions
and
3 deletions
Modules/ExternalProject.cmake
+
2
−
3
View file @
99d6de6c
...
...
@@ -1987,11 +1987,10 @@ function(_ep_add_download_command name)
set
(
comment
"Performing download step (
${
steps
}
) for '
${
name
}
'"
)
_ep_write_verifyfile_script
(
"
${
stamp_dir
}
/verify-
${
name
}
.cmake"
"
${
file
}
"
"
${
hash
}
"
)
endif
()
list
(
APPEND cmd
${
CMAKE_COMMAND
}
-P
${
stamp_dir
}
/verify-
${
name
}
.cmake
COMMAND
)
list
(
APPEND cmd
${
CMAKE_COMMAND
}
-P
${
stamp_dir
}
/verify-
${
name
}
.cmake
)
if
(
NOT no_extract
)
_ep_write_extractfile_script
(
"
${
stamp_dir
}
/extract-
${
name
}
.cmake"
"
${
name
}
"
"
${
file
}
"
"
${
source_dir
}
"
)
list
(
APPEND cmd
${
CMAKE_COMMAND
}
-P
${
stamp_dir
}
/extract-
${
name
}
.cmake
)
list
(
APPEND cmd
COMMAND
${
CMAKE_COMMAND
}
-P
${
stamp_dir
}
/extract-
${
name
}
.cmake
)
else
()
set_property
(
TARGET
${
name
}
PROPERTY _EP_DOWNLOADED_FILE
${
file
}
)
endif
()
...
...
This diff is collapsed.
Click to expand it.
Tests/ExternalProject/CMakeLists.txt
+
10
−
0
View file @
99d6de6c
...
...
@@ -90,6 +90,16 @@ ExternalProject_Add(${proj}
)
set_property
(
TARGET
${
proj
}
PROPERTY FOLDER
""
)
set
(
proj NoExtractLogDownload
)
ExternalProject_Add
(
${
proj
}
URL
${
CMAKE_CURRENT_SOURCE_DIR
}
/gitrepo.tgz
DOWNLOAD_NO_EXTRACT 1
LOG_DOWNLOAD 1
BUILD_COMMAND
""
CONFIGURE_COMMAND
""
INSTALL_COMMAND
""
)
# CVS-based tests:
#
...
...
This diff is collapsed.
Click to expand it.
Preview
0%
Loading
Try again
or
attach a new file
.
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Save comment
Cancel
Please
register
or
sign in
to comment