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
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
André Pedro
CMake
Commits
e1ca1173
Commit
e1ca1173
authored
8 years ago
by
Ruslan Baratov
Browse files
Options
Downloads
Patches
Plain Diff
ExternalProject: Add HTTP_{USERNAME,PASSWORD}
parent
100817dc
No related branches found
Branches containing commit
No related tags found
Tags containing commit
No related merge requests found
Changes
3
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
Auxiliary/vim/syntax/cmake.vim
+1
-1
1 addition, 1 deletion
Auxiliary/vim/syntax/cmake.vim
Modules/ExternalProject-download.cmake.in
+1
-0
1 addition, 0 deletions
Modules/ExternalProject-download.cmake.in
Modules/ExternalProject.cmake
+15
-2
15 additions, 2 deletions
Modules/ExternalProject.cmake
with
17 additions
and
3 deletions
Auxiliary/vim/syntax/cmake.vim
+
1
−
1
View file @
e1ca1173
...
...
@@ -44,7 +44,7 @@ syn keyword cmakeModule
\
contained
syn
keyword cmakeKWExternalProject
\
ALGO ALWAYS BINARY_DIR BUILD_ALWAYS BUILD_BYPRODUCTS BUILD_COMMAND BUILD_IN_SOURCE BYPRODUCTS CMAKE_ARGS CMAKE_CACHE_ARGS CMAKE_CACHE_DEFAULT_ARGS COMMAND COMMENT CONFIGURE_COMMAND CVS CVSROOT CVS_ CVS_MODULE CVS_REPOSITORY CVS_TAG DEPENDEES DEPENDERS DEPENDS DIRECTORY DOWNLOAD_COMMAND DOWNLOAD_DIR DOWNLOAD_NAME DOWNLOAD_NO_PROGRESS EP_BASE EP_INDEPENDENT_STEP_TARGETS EP_PREFIX EP_STEP_TARGETS EP_UPDATE_DISCONNECTED EXCLUDE_FROM_ALL EXCLUDE_FROM_MAIN FORCE GIT_REMOTE_NAME GIT_REPOSITORY GIT_SUBMODULES GIT_TAG HG_REPOSITORY HG_TAG INDEPENDENT INDEPENDENT_STEP_TARGETS INSTALL_COMMAND INSTALL_DIR JOB_POOLS LIST_SEPARATOR LOG LOG_BUILD LOG_CONFIGURE LOG_DOWNLOAD LOG_INSTALL LOG_TEST LOG_UPDATE NO_DEPENDS PATCH_COMMAND PREFIX PROPERTY SOURCE_DIR STAMP_DIR STEP_TARGETS SVN_ SVN_PASSWORD SVN_REPOSITORY SVN_REVISION SVN_TRUST_CERT SVN_USERNAME TEST_AFTER_INSTALL TEST_BEFORE_INSTALL TEST_COMMAND TEST_EXCLUDE_FROM_MAIN TIMEOUT TLS_CAINFO TLS_VERIFY TMP_DIR UPDATE_COMMAND UPDATE_DISCONNECTED URL URL_HASH USES_TERMINAL USES_TERMINAL_BUILD USES_TERMINAL_CONFIGURE USES_TERMINAL_DOWNLOAD USES_TERMINAL_INSTALL USES_TERMINAL_TEST USES_TERMINAL_UPDATE WORKING_DIRECTORY _COMMAND _DIR
\
ALGO ALWAYS BINARY_DIR BUILD_ALWAYS BUILD_BYPRODUCTS BUILD_COMMAND BUILD_IN_SOURCE BYPRODUCTS CMAKE_ARGS CMAKE_CACHE_ARGS CMAKE_CACHE_DEFAULT_ARGS COMMAND COMMENT CONFIGURE_COMMAND CVS CVSROOT CVS_ CVS_MODULE CVS_REPOSITORY CVS_TAG DEPENDEES DEPENDERS DEPENDS DIRECTORY DOWNLOAD_COMMAND DOWNLOAD_DIR DOWNLOAD_NAME DOWNLOAD_NO_PROGRESS EP_BASE EP_INDEPENDENT_STEP_TARGETS EP_PREFIX EP_STEP_TARGETS EP_UPDATE_DISCONNECTED EXCLUDE_FROM_ALL EXCLUDE_FROM_MAIN FORCE GIT_REMOTE_NAME GIT_REPOSITORY GIT_SUBMODULES GIT_TAG HG_REPOSITORY HG_TAG INDEPENDENT INDEPENDENT_STEP_TARGETS INSTALL_COMMAND INSTALL_DIR JOB_POOLS LIST_SEPARATOR LOG LOG_BUILD LOG_CONFIGURE LOG_DOWNLOAD LOG_INSTALL LOG_TEST LOG_UPDATE NO_DEPENDS PATCH_COMMAND PREFIX PROPERTY SOURCE_DIR STAMP_DIR STEP_TARGETS SVN_ SVN_PASSWORD SVN_REPOSITORY SVN_REVISION SVN_TRUST_CERT SVN_USERNAME TEST_AFTER_INSTALL TEST_BEFORE_INSTALL TEST_COMMAND TEST_EXCLUDE_FROM_MAIN TIMEOUT TLS_CAINFO TLS_VERIFY TMP_DIR UPDATE_COMMAND UPDATE_DISCONNECTED URL URL_HASH
HTTP_USERNAME HTTP_PASSWORD
USES_TERMINAL USES_TERMINAL_BUILD USES_TERMINAL_CONFIGURE USES_TERMINAL_DOWNLOAD USES_TERMINAL_INSTALL USES_TERMINAL_TEST USES_TERMINAL_UPDATE WORKING_DIRECTORY _COMMAND _DIR
\
contained
syn
keyword cmakeKWadd_compile_options
...
...
This diff is collapsed.
Click to expand it.
Modules/ExternalProject-download.cmake.in
+
1
−
0
View file @
e1ca1173
...
...
@@ -135,6 +135,7 @@ foreach(i RANGE ${retry_number})
@TIMEOUT_ARGS@
STATUS status
LOG log
@USERPWD_ARGS@
)
list(GET status 0 status_code)
...
...
This diff is collapsed.
Click to expand it.
Modules/ExternalProject.cmake
+
15
−
2
View file @
e1ca1173
...
...
@@ -75,6 +75,10 @@ Create custom targets to build projects in external trees
Hash of file at URL
``URL_MD5 md5``
Equivalent to URL_HASH MD5=md5
``HTTP_USERNAME <username>``
Username for download operation
``HTTP_PASSWORD <username>``
Password for download operation
``TLS_VERIFY <bool>``
Should certificate for https be checked
``TLS_CAINFO <file>``
...
...
@@ -858,7 +862,7 @@ endif()
endfunction
(
_ep_write_gitupdate_script
)
function
(
_ep_write_downloadfile_script script_filename REMOTE LOCAL timeout no_progress hash tls_verify tls_cainfo
)
function
(
_ep_write_downloadfile_script script_filename REMOTE LOCAL timeout no_progress hash tls_verify tls_cainfo
userpwd
)
if
(
timeout
)
set
(
TIMEOUT_ARGS TIMEOUT
${
timeout
}
)
set
(
TIMEOUT_MSG
"
${
timeout
}
seconds"
)
...
...
@@ -906,6 +910,12 @@ function(_ep_write_downloadfile_script script_filename REMOTE LOCAL timeout no_p
set
(
TLS_CAINFO_CODE
"set(CMAKE_TLS_CAINFO
\"
${
tls_cainfo
}
\"
)"
)
endif
()
if
(
userpwd STREQUAL
":"
)
set
(
USERPWD_ARGS
)
else
()
set
(
USERPWD_ARGS USERPWD
"
${
userpwd
}
"
)
endif
()
# Used variables:
# * TLS_VERIFY_CODE
# * TLS_CAINFO_CODE
...
...
@@ -916,6 +926,7 @@ function(_ep_write_downloadfile_script script_filename REMOTE LOCAL timeout no_p
# * SHOW_PROGRESS
# * TIMEOUT_ARGS
# * TIMEOUT_MSG
# * USERPWD_ARGS
configure_file
(
"
${
_ExternalProject_SELF_DIR
}
/ExternalProject-download.cmake.in"
"
${
script_filename
}
"
...
...
@@ -1919,8 +1930,10 @@ function(_ep_add_download_command name)
get_property
(
no_progress TARGET
${
name
}
PROPERTY _EP_DOWNLOAD_NO_PROGRESS
)
get_property
(
tls_verify TARGET
${
name
}
PROPERTY _EP_TLS_VERIFY
)
get_property
(
tls_cainfo TARGET
${
name
}
PROPERTY _EP_TLS_CAINFO
)
get_property
(
http_username TARGET
${
name
}
PROPERTY _EP_HTTP_USERNAME
)
get_property
(
http_password TARGET
${
name
}
PROPERTY _EP_HTTP_PASSWORD
)
set
(
download_script
"
${
stamp_dir
}
/download-
${
name
}
.cmake"
)
_ep_write_downloadfile_script
(
"
${
download_script
}
"
"
${
url
}
"
"
${
file
}
"
"
${
timeout
}
"
"
${
no_progress
}
"
"
${
hash
}
"
"
${
tls_verify
}
"
"
${
tls_cainfo
}
"
)
_ep_write_downloadfile_script
(
"
${
download_script
}
"
"
${
url
}
"
"
${
file
}
"
"
${
timeout
}
"
"
${
no_progress
}
"
"
${
hash
}
"
"
${
tls_verify
}
"
"
${
tls_cainfo
}
"
"
${
http_username
}
:
${
http_password
}
"
)
set
(
cmd
${
CMAKE_COMMAND
}
-P
"
${
download_script
}
"
COMMAND
)
if
(
no_extract
)
...
...
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