Skip to content
GitLab
Projects
Groups
Snippets
Help
Loading...
Help
What's new
10
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
Open sidebar
CMake
CMake
Commits
d6475daa
Commit
d6475daa
authored
Dec 08, 2018
by
wahikihiki
Committed by
Brad King
Jan 16, 2019
1
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Modules/CTest: Set SubmitURL
parent
938f06fd
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
14 additions
and
6 deletions
+14
-6
Modules/CTest.cmake
Modules/CTest.cmake
+13
-0
Modules/DartConfiguration.tcl.in
Modules/DartConfiguration.tcl.in
+1
-6
No files found.
Modules/CTest.cmake
View file @
d6475daa
...
...
@@ -89,6 +89,7 @@ if(BUILD_TESTING)
if
(
EXISTS
"
${
PROJECT_SOURCE_DIR
}
/CTestConfig.cmake"
)
include
(
"
${
PROJECT_SOURCE_DIR
}
/CTestConfig.cmake"
)
SET_IF_SET_AND_NOT_SET
(
NIGHTLY_START_TIME
"
${
CTEST_NIGHTLY_START_TIME
}
"
)
SET_IF_SET_AND_NOT_SET
(
SUBMIT_URL
"
${
CTEST_SUBMIT_URL
}
"
)
SET_IF_SET_AND_NOT_SET
(
DROP_METHOD
"
${
CTEST_DROP_METHOD
}
"
)
SET_IF_SET_AND_NOT_SET
(
DROP_SITE
"
${
CTEST_DROP_SITE
}
"
)
SET_IF_SET_AND_NOT_SET
(
DROP_SITE_USER
"
${
CTEST_DROP_SITE_USER
}
"
)
...
...
@@ -111,6 +112,18 @@ if(BUILD_TESTING)
endif
()
SET_IF_NOT_SET
(
NIGHTLY_START_TIME
"00:00:00 EDT"
)
if
(
NOT SUBMIT_URL
)
set
(
SUBMIT_URL
"
${
DROP_METHOD
}
://"
)
if
(
DROP_SITE_USER
)
string
(
APPEND SUBMIT_URL
"
${
DROP_SITE_USER
}
"
)
if
(
DROP_SITE_PASSWORD
)
string
(
APPEND SUBMIT_URL
":
${
DROP_SITE_PASSWORD
}
"
)
endif
()
string
(
APPEND SUBMIT_URL
"@"
)
endif
()
string
(
APPEND SUBMIT_URL
"
${
DROP_SITE
}${
DROP_SITE_LOCATION
}
"
)
endif
()
find_program
(
CVSCOMMAND cvs
)
set
(
CVS_UPDATE_OPTIONS
"-d -A -P"
CACHE STRING
"Options passed to the cvs update command."
)
...
...
Modules/DartConfiguration.tcl.in
View file @
d6475daa
...
...
@@ -20,12 +20,7 @@ BuildName: @BUILDNAME@
LabelsForSubprojects: @CTEST_LABELS_FOR_SUBPROJECTS@
# Submission information
DropSite: @DROP_SITE@
DropLocation: @DROP_LOCATION@
DropSiteUser: @DROP_SITE_USER@
DropSitePassword: @DROP_SITE_PASSWORD@
DropSiteMode: @DROP_SITE_MODE@
DropMethod: @DROP_METHOD@
SubmitURL: @SUBMIT_URL@
# Dashboard start time
NightlyStartTime: @NIGHTLY_START_TIME@
...
...
Brad King
@brad.king
mentioned in commit
fefae527
·
Jan 21, 2019
mentioned in commit
fefae527
mentioned in commit fefae527c8c54d249c44313d9b09cdb0157e2f5d
Toggle commit list
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
.
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment